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

s4-smb2: SMB2 uses NT_STATUS_CANCELLED for cancelled locks

This commit is contained in:
Andrew Tridgell 2009-11-26 17:38:50 +11:00
parent 7c158bdb1d
commit d3d7ca8eea

View File

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