summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/ntvfs/posix/pvfs_lock.c2
1 files changed, 1 insertions, 1 deletions
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,