Revert "NFSv4: Fall back to ordinary lookup if nfs4_atomic_open() returns EISDIR"

This reverts commit 80e60639f1.

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>
This commit is contained in:
Trond Myklebust 2010-11-03 10:24:16 -04:00
parent 1e657bd51f
commit 23ebbd9acf
1 changed files with 1 additions and 1 deletions

View File

@ -1345,12 +1345,12 @@ static struct dentry *nfs_atomic_lookup(struct inode *dir, struct dentry *dentry
res = NULL; res = NULL;
goto out; goto out;
/* This turned out not to be a regular file */ /* This turned out not to be a regular file */
case -EISDIR:
case -ENOTDIR: case -ENOTDIR:
goto no_open; goto no_open;
case -ELOOP: case -ELOOP:
if (!(nd->intent.open.flags & O_NOFOLLOW)) if (!(nd->intent.open.flags & O_NOFOLLOW))
goto no_open; goto no_open;
/* case -EISDIR: */
/* case -EINVAL: */ /* case -EINVAL: */
default: default:
res = ERR_CAST(inode); res = ERR_CAST(inode);