]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
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)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 26 Apr 2010 14:47:53 +0000 (07:47 -0700)
commit 80e60639f1b7c121a7fea53920c5a4b94009361a upstream.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
fs/nfs/dir.c

index 8b5382efd454ce63a71adc1f9d14913eb7adb44e..af6948d6faf2ff4aa7fc5ca37cab2e0d67a300e1 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 */
                                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 -ENOTDIR:
                                goto no_open;
                        case -ELOOP:
                                if (!(nd->intent.open.flags & O_NOFOLLOW))
                                        goto no_open;
-                       /* case -EISDIR: */
                        /* case -EINVAL: */
                        default:
                                goto out;
                        /* case -EINVAL: */
                        default:
                                goto out;