mirror of
https://github.com/samba-team/samba.git
synced 2025-10-21 03:33:16 +03:00
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 commit is contained in:
committed by
Gerald (Jerry) Carter
parent
c214996391
commit
a4f17fcd92
@@ -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,
|
||||
|
Reference in New Issue
Block a user