summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2012-05-28 17:36:28 +0200
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-05-28 23:21:48 +0200
commitfb13bfa7e1bcfdcfdece47c24b62f1a1cad957e9 (patch)
treee4df7a2bb6737e6e725c7b333e824a9edf77a98f /fs
parentNFSv4: update_changeattr does not need to set NFS_INO_REVAL_PAGECACHE (diff)
downloadlinux-fb13bfa7e1bcfdcfdece47c24b62f1a1cad957e9.tar.xz
linux-fb13bfa7e1bcfdcfdece47c24b62f1a1cad957e9.zip
NFSv4: Map NFS4ERR_SHARE_DENIED into an EACCES error instead of EIO
If a file OPEN is denied due to a share lock, the resulting NFS4ERR_SHARE_DENIED is currently mapped to the default EIO. This patch adds a more appropriate mapping, and brings Linux into line with what Solaris 10 does. See https://bugzilla.kernel.org/show_bug.cgi?id=43286 Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> Cc: stable@vger.kernel.org
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/nfs4proc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index af2db2c49c5f..42d9e9ca7d2f 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -103,6 +103,8 @@ static int nfs4_map_errors(int err)
case -NFS4ERR_BADOWNER:
case -NFS4ERR_BADNAME:
return -EINVAL;
+ case -NFS4ERR_SHARE_DENIED:
+ return -EACCES;
default:
dprintk("%s could not handle NFSv4 error %d\n",
__func__, -err);