The branch, master has been updated
via 7e96db4... After talking with Microsoft engineers, the "lock spin
time" is no longer used in SMB2.
from af44593... (Finally) fix bug #7158 - SMB2 connection resets during
IOZone tests from 64-bit Vista client
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 7e96db4f50ed84b598deaf0647676c0e8487920e
Author: Jeremy Allison <j...@samba.org>
Date: Wed May 19 20:09:08 2010 -0700
After talking with Microsoft engineers, the "lock spin time" is
no longer used in SMB2.
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/reply.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index f02fc9a..8aa1633 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))
--
Samba Shared Repository
