summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2010-11-03 15:24:16 +0100
committerTrond Myklebust <Trond.Myklebust@netapp.com>2010-11-16 02:44:27 +0100
commit23ebbd9acf5756b6eb783df84403e3ab668a6bce (patch)
tree11f632c35ccd0569b70811ad7b78c14831697041 /fs/nfs
parentRegression: fix mounting NFS when NFSv3 support is not compiled (diff)
downloadlinux-23ebbd9acf5756b6eb783df84403e3ab668a6bce.tar.xz
linux-23ebbd9acf5756b6eb783df84403e3ab668a6bce.zip
Revert "NFSv4: Fall back to ordinary lookup if nfs4_atomic_open() returns EISDIR"
This reverts commit 80e60639f1b7c121a7fea53920c5a4b94009361a. This change requires further fixes to ensure that the open doesn't succeed if the lookup later results in a regular file being created. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-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 07ac3847e562..635ff65d3092 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1345,12 +1345,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:
res = ERR_CAST(inode);