smbd: Remove unused "mid" from delay_for_oplock
authorVolker Lendecke <vl@samba.org>
Thu, 26 Sep 2013 22:49:54 +0000 (15:49 -0700)
committerStefan Metzmacher <metze@samba.org>
Wed, 23 Oct 2013 09:57:05 +0000 (11:57 +0200)
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
source3/smbd/open.c

index f9e6496214b27975a8e6f3b5eb68e3e1d3b9469f..a9147f80b82e75435b9ec76a8230848c6b66e022 100644 (file)
@@ -1290,7 +1290,6 @@ static bool validate_oplock_types(struct share_mode_lock *lck)
 }
 
 static bool delay_for_oplock(files_struct *fsp,
-                            uint64_t mid,
                             int oplock_request,
                             struct share_mode_lock *lck,
                             bool have_sharing_violation)
@@ -2344,7 +2343,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
                        smb_panic("validate_oplock_types failed");
                }
 
-               if (delay_for_oplock(fsp, req->mid, 0, lck, false)) {
+               if (delay_for_oplock(fsp, 0, lck, false)) {
                        schedule_defer_open(lck, request_time, req);
                        TALLOC_FREE(lck);
                        DEBUG(10, ("Sent oplock break request to kernel "
@@ -2455,7 +2454,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
 
        if ((req != NULL) &&
            delay_for_oplock(
-                   fsp, req->mid, oplock_request, lck,
+                   fsp, oplock_request, lck,
                    NT_STATUS_EQUAL(status, NT_STATUS_SHARING_VIOLATION))) {
                schedule_defer_open(lck, request_time, req);
                TALLOC_FREE(lck);