s3 oplocks: Make the level2 oplock contention API more granular

[tprouty/samba.git] / source3 / smbd / reply.c

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 60e2e5dc7a525cb878c54748fd821db57b906d09..151f9d0827d0449e90057ca0ef889499901b99b1 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -3010,8 +3010,6 @@ void reply_lockread(struct smb_request *req)
                return;
        }
 
-       release_level_2_oplocks_on_change(fsp);
-
        numtoread = SVAL(req->vwv+1, 0);
        startpos = IVAL_TO_SMB_OFF_T(req->vwv+2, 0);
 
@@ -4497,8 +4495,6 @@ void reply_lock(struct smb_request *req)
                return;
        }
 
-       release_level_2_oplocks_on_change(fsp);
-
        count = (uint64_t)IVAL(req->vwv+1, 0);
        offset = (uint64_t)IVAL(req->vwv+3, 0);
 
@@ -6870,13 +6866,6 @@ void reply_lockingX(struct smb_request *req)
                }
        }
 
-       /*
-        * We do this check *after* we have checked this is not a oplock break
-        * response message. JRA.
-        */
-
-       release_level_2_oplocks_on_change(fsp);
-
        if (req->buflen <
            (num_ulocks + num_locks) * (large_file_format ? 20 : 10)) {
                reply_nterror(req, NT_STATUS_INVALID_PARAMETER);