Move a variable into the area of code where it's used.
authorJeremy Allison <jra@samba.org>
Thu, 2 May 2013 20:08:16 +0000 (13:08 -0700)
committerKarolin Seeger <kseeger@samba.org>
Wed, 8 May 2013 19:26:14 +0000 (21:26 +0200)
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
(cherry picked from commit 1102e73832f78ca5decc928d6c3649d4fe68eab7)

source3/smbd/smb2_server.c

index a0ac2f2bbf392ab657f76d9874ba1b68b724d09f..cb63f62eeba4534605f57528214c8c50cf566914 100644 (file)
@@ -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