summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2010-03-25 13:51:05 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-04-26 07:41:25 -0700
commit2d71e7c297ba7fdce9ff2084f2873fef66f2fb17 (patch)
treec189991ee9a741cf38aeedb98d4e4e3e64e51ec7 /fs
parent20580fe38431aead39320ac7a8ff201e1f8744af (diff)
downloadlwn-2d71e7c297ba7fdce9ff2084f2873fef66f2fb17.tar.gz
lwn-2d71e7c297ba7fdce9ff2084f2873fef66f2fb17.zip
NFSv4: Fall back to ordinary lookup if nfs4_atomic_open() returns EISDIR
commit 80e60639f1b7c121a7fea53920c5a4b94009361a upstream. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/dir.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index f360e9cf3d74..dff7f0d4004f 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1025,12 +1025,12 @@ static struct dentry *nfs_atomic_lookup(struct inode *dir, struct dentry *dentry
res = NULL;
goto out;
/* This turned out not to be a regular file */
+ case -EISDIR:
case -ENOTDIR:
goto no_open;
case -ELOOP:
if (!(nd->intent.open.flags & O_NOFOLLOW))
goto no_open;
- /* case -EISDIR: */
/* case -EINVAL: */
default:
goto out;