From 11e447be7a294083ec7a77335f382f44875a6f0d Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 18 Jul 2011 23:39:07 -0400
Subject: [PATCH] --- yaml --- r: 257404 b: refs/heads/master c:
 86c98e8cdb21ff4628f4d48559ab6e006380fa4b h: refs/heads/master v: v3

---
 [refs]            | 2 +-
 trunk/fs/dcache.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 9e2a826e84be..d751f936ecd8 100644
--- 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
index d1d6b3349ec7..3c34ac0e9a1b 100644
--- 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);