diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-11-26 17:38:50 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-11-27 16:05:06 +1100 |
| commit | d3d7ca8eeab13c00705188102855525a21dd5345 (patch) | |
| tree | 80d1c40ddddab9b89d581ced76b4ed87c311f85c /source4/ntvfs/posix | |
| parent | 7c158bdb1d0e217e06f54d2e2cef12a5433d3578 (diff) | |
| download | samba-d3d7ca8eeab13c00705188102855525a21dd5345.tar.gz samba-d3d7ca8eeab13c00705188102855525a21dd5345.tar.bz2 samba-d3d7ca8eeab13c00705188102855525a21dd5345.zip | |
s4-smb2: SMB2 uses NT_STATUS_CANCELLED for cancelled locks
Diffstat (limited to 'source4/ntvfs/posix')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_lock.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source4/ntvfs/posix/pvfs_lock.c b/source4/ntvfs/posix/pvfs_lock.c index 711c924ae3..11757deea4 100644 --- a/source4/ntvfs/posix/pvfs_lock.c +++ b/source4/ntvfs/posix/pvfs_lock.c @@ -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 |