From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 26 Jun 2011 01:48:43 +0000 (-0400)
Subject: nfs: LOOKUP_{OPEN,CREATE,EXCL} is set only on the last step
X-Git-Tag: v3.1-rc1~282^2~68
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=8aeb376ca0fe61038166c3b8243c678addb80abf;p=~emulex%2Finfiniband.git

nfs: LOOKUP_{OPEN,CREATE,EXCL} is set only on the last step

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 77ae95f1549..8a45e6d1f6a 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -997,14 +997,12 @@ static int nfs_check_verifier(struct inode *dir, struct dentry *dentry)
  * Return the intent data that applies to this particular path component
  *
  * Note that the current set of intents only apply to the very last
- * component of the path.
- * We check for this using LOOKUP_CONTINUE and LOOKUP_PARENT.
+ * component of the path and none of them is set before that last
+ * component.
  */
 static inline unsigned int nfs_lookup_check_intent(struct nameidata *nd,
 						unsigned int mask)
 {
-	if (nd->flags & (LOOKUP_CONTINUE|LOOKUP_PARENT))
-		return 0;
 	return nd->flags & mask;
 }