---

yaml --- r: 257404 b: refs/heads/master c: 86c98e8 h: refs/heads/master v: v3
git-mirror · Jul 21, 2011 · 11e447b · 11e447b
1 parent f33f40c
commit 11e447b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4b9f0058145a3bed4199eacee62a9969c163401
+refs/heads/master: 86c98e8cdb21ff4628f4d48559ab6e006380fa4b
diff --git a/trunk/fs/dcache.c b/trunk/fs/dcache.c
@@ -549,10 +549,6 @@ struct dentry *dget_parent(struct dentry *dentry)
 	 */
 	rcu_read_lock();
 	ret = dentry->d_parent;
-	if (!ret) {
-		rcu_read_unlock();
-		goto out;
-	}
 	spin_lock(&ret->d_lock);
 	if (unlikely(ret != dentry->d_parent)) {
 		spin_unlock(&ret->d_lock);
@@ -563,7 +559,6 @@ struct dentry *dget_parent(struct dentry *dentry)
 	BUG_ON(!ret->d_count);
 	ret->d_count++;
 	spin_unlock(&ret->d_lock);
-out:
 	return ret;
 }
 EXPORT_SYMBOL(dget_parent);