diff --git a/[refs] b/[refs] index dd7d852ece13..5776ea9a715b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e657bd51f313d87fbbb22d1edf625dba87ef353 +refs/heads/master: 23ebbd9acf5756b6eb783df84403e3ab668a6bce diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c index 07ac3847e562..635ff65d3092 100644 --- a/trunk/fs/nfs/dir.c +++ b/trunk/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);