From 7e96db4f50ed84b598deaf0647676c0e8487920e Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 19 May 2010 20:09:08 -0700 Subject: After talking with Microsoft engineers, the "lock spin time" is no longer used in SMB2. Jeremy. --- source3/smbd/reply.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source3/smbd/reply.c') 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)) -- cgit