After talking with Microsoft engineers, the "lock spin time" is

no longer used in SMB2.

Jeremy.

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index f02fc9a15203aa21775260a8f8875246274d822d..8aa1633735c32bdff683ad9236bd4663f9ce32ba 100644 (file)
--- 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))