sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

r7459: fixed pvfs for the RAW-MUX test

Browse Source 
when you cancel a lock, w2k3 gives NT_STATUS_FILE_LOCK_CONFLICT not
NT_STATUS_CANCELLED. Strange.
(This used to be commit a4f17fcd92)
This commit is contained in:
Andrew Tridgell 2005-06-10 08:52:26 +00:00 committed by Gerald (Jerry) Carter
parent 0f8d452ca0
commit 70656780ad
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source4/ntvfs/posix/pvfs_lock.c
View File

@ -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,