summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2013-03-23 15:22:45 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2013-03-27 12:44:40 -0400
commit6e3cf2415269894895074f139ef2e95ef14ddd5d (patch)
treef1c685aa5306e6e8290054f7474578f1cef098c8 /fs/nfs
parentccb46e2063fe0816c3f28a8d328a9bbac7e88648 (diff)
downloadlinux-stable-6e3cf2415269894895074f139ef2e95ef14ddd5d.tar.gz
linux-stable-6e3cf2415269894895074f139ef2e95ef14ddd5d.tar.bz2
linux-stable-6e3cf2415269894895074f139ef2e95ef14ddd5d.zip
NFSv4: Add a mapping for NFS4ERR_FILE_OPEN in nfs4_map_errors
With unlink is an asynchronous operation in the sillyrename case, it expects nfs4_async_handle_error() to map the error correctly. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-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 06e5a72b5fa2..3e7d42fb775c 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -107,6 +107,8 @@ static int nfs4_map_errors(int err)
return -EPROTONOSUPPORT;
case -NFS4ERR_ACCESS:
return -EACCES;
+ case -NFS4ERR_FILE_OPEN:
+ return -EBUSY;
default:
dprintk("%s could not handle NFSv4 error %d\n",
__func__, -err);