summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2013-09-26 15:49:54 -0700
committerStefan Metzmacher <metze@samba.org>2013-10-23 11:57:05 +0200
commitccc808e0d72be5933ae2449ee8ee56262e631b72 (patch)
treea9982c8e6e3332e67c1e8b2f72c37b834a9c2bf6
parent4c8bdf7878e7b1b85be356680c5c9a12be6d7244 (diff)
downloadsamba-ccc808e0d72be5933ae2449ee8ee56262e631b72.tar.gz
samba-ccc808e0d72be5933ae2449ee8ee56262e631b72.tar.bz2
samba-ccc808e0d72be5933ae2449ee8ee56262e631b72.zip
smbd: Remove unused "mid" from delay_for_oplock
Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--source3/smbd/open.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index f9e6496214..a9147f80b8 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -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);