From 70656780add642ae390c5be48255bd99af915445 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 10 Jun 2005 08:52:26 +0000
Subject: r7459: fixed pvfs for the RAW-MUX test

when you cancel a lock, w2k3 gives NT_STATUS_FILE_LOCK_CONFLICT not
NT_STATUS_CANCELLED. Strange.
(This used to be commit a4f17fcd9218f16b6cc166b2f797e8889d6f63f4)
---
 source4/ntvfs/posix/pvfs_lock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/ntvfs')

diff --git a/source4/ntvfs/posix/pvfs_lock.c b/source4/ntvfs/posix/pvfs_lock.c
index 8015fc46c4..e803ce3d41 100644
--- a/source4/ntvfs/posix/pvfs_lock.c
+++ b/source4/ntvfs/posix/pvfs_lock.c
@@ -118,7 +118,7 @@ static void pvfs_pending_lock_continue(void *private, enum pvfs_wait_notice reas
 
 	/* we don't retry on a cancel */
 	if (reason == PVFS_WAIT_CANCEL) {
-		status = NT_STATUS_CANCELLED;
+		status = NT_STATUS_FILE_LOCK_CONFLICT;
 	} else {
 		status = brl_lock(pvfs->brl_context,
 				  &f->handle->brl_locking_key,
-- 
cgit