From d3d7ca8eeab13c00705188102855525a21dd5345 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 26 Nov 2009 17:38:50 +1100
Subject: s4-smb2: SMB2 uses NT_STATUS_CANCELLED for cancelled locks

---
 source4/ntvfs/posix/pvfs_lock.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'source4')

diff --git a/source4/ntvfs/posix/pvfs_lock.c b/source4/ntvfs/posix/pvfs_lock.c
index 711c924ae3..11757deea4 100644
--- a/source4/ntvfs/posix/pvfs_lock.c
+++ b/source4/ntvfs/posix/pvfs_lock.c
@@ -116,7 +116,11 @@ static void pvfs_pending_lock_continue(void *private_data, enum pvfs_wait_notice
 
 	/* we don't retry on a cancel */
 	if (reason == PVFS_WAIT_CANCEL) {
-		status = NT_STATUS_FILE_LOCK_CONFLICT;
+		if (pvfs->ntvfs->ctx->protocol != PROTOCOL_SMB2) {
+			status = NT_STATUS_FILE_LOCK_CONFLICT;
+		} else {
+			status = NT_STATUS_CANCELLED;
+		}
 	} else {
 		/* 
 		 * here it's important to pass the pending pointer
-- 
cgit