Skip to content

Commit

Permalink
Revert "NFSv4: Fall back to ordinary lookup if nfs4_atomic_open() ret…
Browse files Browse the repository at this point in the history
…urns EISDIR"

This reverts commit 80e6063.

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>
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed Nov 16, 2010
1 parent 1e657bd commit 23ebbd9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/nfs/dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 23ebbd9

Please sign in to comment.