From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 20 Aug 2013 15:59:41 +0000 (-0400)
Subject: NFS: Pass in lookup flags from nfs_atomic_open to nfs_lookup
X-Git-Tag: MMI-PSA29.97-13-9~13623^2~90
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1472b83eae0bf09ab76ebcb1373dbd210e97f911;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

NFS: Pass in lookup flags from nfs_atomic_open to nfs_lookup

When doing an open of a directory, ensure that we do pass the lookup flags
from nfs_atomic_open into nfs_lookup.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index be3da6fe3ad4..29d5463dcd65 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1407,6 +1407,7 @@ int nfs_atomic_open(struct inode *dir, struct dentry *dentry,
 	struct dentry *res;
 	struct iattr attr = { .ia_valid = ATTR_OPEN };
 	struct inode *inode;
+	unsigned int lookup_flags = 0;
 	int err;
 
 	/* Expect a negative dentry */
@@ -1429,6 +1430,7 @@ int nfs_atomic_open(struct inode *dir, struct dentry *dentry,
 			 */
 			return -ENOENT;
 		}
+		lookup_flags = LOOKUP_OPEN|LOOKUP_DIRECTORY;
 		goto no_open;
 	}
 
@@ -1479,7 +1481,7 @@ out:
 	return err;
 
 no_open:
-	res = nfs_lookup(dir, dentry, 0);
+	res = nfs_lookup(dir, dentry, lookup_flags);
 	err = PTR_ERR(res);
 	if (IS_ERR(res))
 		goto out;