summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@hammerspace.com>2019-08-09 15:03:11 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-09-21 07:15:33 +0200
commitc9e6a3f0e9fa14f99457a506a91f346c6161ee21 (patch)
tree31b448bb641b75e7cb3ef1de84559b01534f21de /fs
parenta46102f47dfe7da531facb9eacc5020e86ae7229 (diff)
downloadlinux-stable-c9e6a3f0e9fa14f99457a506a91f346c6161ee21.tar.gz
linux-stable-c9e6a3f0e9fa14f99457a506a91f346c6161ee21.tar.bz2
linux-stable-c9e6a3f0e9fa14f99457a506a91f346c6161ee21.zip
NFSv4: Fix return values for nfs4_file_open()
[ Upstream commit 90cf500e338ab3f3c0f126ba37e36fb6a9058441 ] Currently, we are translating RPC level errors such as timeouts, as well as interrupts etc into EOPENSTALE, which forces a single replay of the open attempt. What we actually want to do is force the replay only in the cases where the returned error indicates that the file may have changed on the server. So the fix is to spell out the exact set of errors where we want to return EOPENSTALE. Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/nfs4file.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/nfs/nfs4file.c b/fs/nfs/nfs4file.c
index 2b3e0f1ca572..b8d316a338bc 100644
--- a/fs/nfs/nfs4file.c
+++ b/fs/nfs/nfs4file.c
@@ -74,13 +74,13 @@ nfs4_file_open(struct inode *inode, struct file *filp)
if (IS_ERR(inode)) {
err = PTR_ERR(inode);
switch (err) {
- case -EPERM:
- case -EACCES:
- case -EDQUOT:
- case -ENOSPC:
- case -EROFS:
- goto out_put_ctx;
default:
+ goto out_put_ctx;
+ case -ENOENT:
+ case -ESTALE:
+ case -EISDIR:
+ case -ENOTDIR:
+ case -ELOOP:
goto out_drop;
}
}