From 814c4ca8f4d33c2fee5336ae5c42a379b9bb3608 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Wed, 19 Sep 2012 15:49:51 +0100
Subject: [PATCH] --- yaml --- r: 329017 b: refs/heads/master c:
 1fe0c0230a7c2d5f4061e681a3f3be9512446d23 h: refs/heads/master i:   329015:
 93aa4fdb14bcab95f591859f287b8b2d6b795031 v: v3

---
 [refs]            | 2 +-
 trunk/fs/dcache.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 95696a0b8b67..7aec7b325ee4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2903ff019b346ab8d36ebbf54853c3aaf6590608
+refs/heads/master: 1fe0c0230a7c2d5f4061e681a3f3be9512446d23
diff --git a/trunk/fs/dcache.c b/trunk/fs/dcache.c
index 16521a9f2038..fbee67b92651 100644
--- a/trunk/fs/dcache.c
+++ b/trunk/fs/dcache.c
@@ -2109,7 +2109,7 @@ void d_delete(struct dentry * dentry)
 	inode = dentry->d_inode;
 	isdir = S_ISDIR(inode->i_mode);
 	if (dentry->d_count == 1) {
-		if (inode && !spin_trylock(&inode->i_lock)) {
+		if (!spin_trylock(&inode->i_lock)) {
 			spin_unlock(&dentry->d_lock);
 			cpu_relax();
 			goto again;