summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2013-05-02 13:08:16 -0700
committerKarolin Seeger <kseeger@samba.org>2013-05-08 21:26:14 +0200
commit805b0296ff8c87bf6b340ce199f4da2ab66c8654 (patch)
tree8f71ad11c309a93e5303675b717590692f512992
parent0fea4e392a37b884242c26a35990ab6313b121a0 (diff)
downloadsamba-805b0296ff8c87bf6b340ce199f4da2ab66c8654.tar.gz
Move a variable into the area of code where it's used.
Signed-off-by: Jeremy Allison <jra@samba.org> Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com> (cherry picked from commit 1102e73832f78ca5decc928d6c3649d4fe68eab7)
-rw-r--r--source3/smbd/smb2_server.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index a0ac2f2bbf3..cb63f62eeba 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -1272,7 +1272,6 @@ NTSTATUS smbd_smb2_request_pending_queue(struct smbd_smb2_request *req,
uint32_t defer_time)
{
NTSTATUS status;
- int idx = req->current_idx;
struct timeval defer_endtime;
uint8_t *outhdr = NULL;
uint32_t flags;
@@ -1296,7 +1295,7 @@ NTSTATUS smbd_smb2_request_pending_queue(struct smbd_smb2_request *req,
return NT_STATUS_OK;
}
- if (req->in.vector_count > idx + SMBD_SMB2_NUM_IOV_PER_REQ) {
+ if (req->in.vector_count > req->current_idx + SMBD_SMB2_NUM_IOV_PER_REQ) {
/*
* We're trying to go async in a compound
* request chain. This is not allowed.
@@ -1318,6 +1317,7 @@ NTSTATUS smbd_smb2_request_pending_queue(struct smbd_smb2_request *req,
}
if (req->out.vector_count >= (2*SMBD_SMB2_NUM_IOV_PER_REQ)) {
+ int idx = req->current_idx;
/*
* This is a compound reply. We
* must do an interim response