diff options
author | Jeremy Allison <jra@samba.com> | 2006-08-02 21:56:33 +0000 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2006-08-11 21:28:47 +0000 |
commit | 7ee1af765dfa3146aef958258003245e082284e5 (patch) | |
tree | 90ab87a136d63c937064e595fd8062e5bc721e03 /fs/cifs/netmisc.c | |
parent | 6c3d8909d85b2c18fd7a6e64f0ca757a257b40fa (diff) | |
download | linux-3.10-7ee1af765dfa3146aef958258003245e082284e5.tar.gz linux-3.10-7ee1af765dfa3146aef958258003245e082284e5.tar.bz2 linux-3.10-7ee1af765dfa3146aef958258003245e082284e5.zip |
[CIFS]
Allow Windows blocking locks to be cancelled via a
CANCEL_LOCK call. TODO - restrict this to servers
that support NT_STATUS codes (Win9x will probably
not support this call).
Signed-off-by: Jeremy Allison <jra@samba.org>
Signed-off-by: Steve French <sfrench@us.ibm.com>
(cherry picked from 570d4d2d895569825d0d017d4e76b51138f68864 commit)
Diffstat (limited to 'fs/cifs/netmisc.c')
-rw-r--r-- | fs/cifs/netmisc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c index b66eff5dc62..ce87550e918 100644 --- a/fs/cifs/netmisc.c +++ b/fs/cifs/netmisc.c @@ -72,6 +72,7 @@ static const struct smb_to_posix_error mapping_table_ERRDOS[] = { {ERRinvlevel,-EOPNOTSUPP}, {ERRdirnotempty, -ENOTEMPTY}, {ERRnotlocked, -ENOLCK}, + {ERRcancelviolation, -ENOLCK}, {ERRalreadyexists, -EEXIST}, {ERRmoredata, -EOVERFLOW}, {ERReasnotsupported,-EOPNOTSUPP}, |