NFSv4: Fall back to ordinary lookup if nfs4_atomic_open() returns EISDIR
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 25 Mar 2010 17:51:05 +0000 (13:51 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Fri, 9 Apr 2010 23:08:16 +0000 (19:08 -0400)
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: stable@kernel.org
fs/nfs/dir.c

index c6f2750648f45d76f8ca57c30b82c0759f5a91d9..be46f26c9a5616cc2181fa98b9d9b7157a2cd7ce 100644 (file)
@@ -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;