---

yaml --- r: 233241 b: refs/heads/master c: 4e924a4 h: refs/heads/master i: 233239: 6967e0d v: v3
git-mirror · Feb 15, 2011 · 6ac6dcf · 6ac6dcf
1 parent bd8ebe6
commit 6ac6dcf
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f60aef7ec625236a6366722bb1be7b37596bf0ae
+refs/heads/master: 4e924a4f53a0e1ea060bd50695a12a238b250322
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
@@ -455,14 +455,6 @@ static int nameidata_dentry_drop_rcu(struct nameidata *nd, struct dentry *dentry
 	struct fs_struct *fs = current->fs;
 	struct dentry *parent = nd->path.dentry;
 
-	/*
-	 * It can be possible to revalidate the dentry that we started
-	 * the path walk with. force_reval_path may also revalidate the
-	 * dentry already committed to the nameidata.
-	 */
-	if (unlikely(parent == dentry))
-		return nameidata_drop_rcu(nd);
-
 	BUG_ON(!(nd->flags & LOOKUP_RCU));
 	if (nd->root.mnt) {
 		spin_lock(&fs->lock);