From 7affc322bfdaf92ea445e70aa3b0e4b5c6549847 Mon Sep 17 00:00:00 2001
From: Hua Zhong <hzhong@gmail.com>
Date: Sun, 25 Jun 2006 05:49:32 -0700
Subject: [PATCH] --- yaml --- r: 29830 b: refs/heads/master c:
 f58a1ebb22f128fccfeafb2b18557c87741cd627 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e5745a4f5b9e..b4c7446e9599 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d84a84775bba661d5a3fd06757bbb419381937f3
+refs/heads/master: f58a1ebb22f128fccfeafb2b18557c87741cd627
diff --git a/trunk/fs/dcache.c b/trunk/fs/dcache.c
index 313b54b2b8f2..b85fda360533 100644
--- a/trunk/fs/dcache.c
+++ b/trunk/fs/dcache.c
@@ -406,7 +406,7 @@ static void prune_dcache(int count, struct super_block *sb)
 		cond_resched_lock(&dcache_lock);
 
 		tmp = dentry_unused.prev;
-		if (unlikely(sb)) {
+		if (sb) {
 			/* Try to find a dentry for this sb, but don't try
 			 * too hard, if they aren't near the tail they will
 			 * be moved down again soon