---

yaml --- r: 230860 b: refs/heads/master c: 90dbb77 h: refs/heads/master v: v3
git-mirror · Jan 14, 2011 · 61057fd · 61057fd
1 parent 824f4fa
commit 61057fd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb20c18db6fbb5e6ba499c76473a487d35073467
+refs/heads/master: 90dbb77ba48dddb87445d238e84cd137cf97dd98
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
@@ -479,6 +479,14 @@ 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);