diff options
| author | Jeremy Allison <jra@samba.org> | 2010-05-19 20:09:08 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-05-19 20:09:08 -0700 |
| commit | 7e96db4f50ed84b598deaf0647676c0e8487920e (patch) | |
| tree | 00f2495220aaafef90e5227f2033a0808ec0cbd9 /source3 | |
| parent | af445935555dc3fab3cefc52b375dd18b8d9bb4c (diff) | |
| download | samba-7e96db4f50ed84b598deaf0647676c0e8487920e.tar.gz samba-7e96db4f50ed84b598deaf0647676c0e8487920e.tar.bz2 samba-7e96db4f50ed84b598deaf0647676c0e8487920e.zip | |
After talking with Microsoft engineers, the "lock spin time" is
no longer used in SMB2.
Jeremy.
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/smbd/reply.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index f02fc9a152..8aa1633735 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -7224,7 +7224,8 @@ NTSTATUS smbd_do_locking(struct smb_request *req, * * Replacement for do_lock_spin(). JRA. */ - if (br_lck && lp_blocking_locks(SNUM(conn)) && + if (!smbd_server_conn->allow_smb2 && + br_lck && lp_blocking_locks(SNUM(conn)) && lp_lock_spin_time() && !blocking_lock && NT_STATUS_EQUAL((status), NT_STATUS_FILE_LOCK_CONFLICT)) |