From 85ac5eae4557fd0f6771b549394b79d111b31c78 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Thu, 9 Dec 2010 15:39:34 +0100
Subject: [PATCH] --- yaml --- r: 229092 b: refs/heads/master c:
 8057b9653923bd762d89ccb730c76cba40ce96f0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 41fbec16dcc2..9e845a69476c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ed0cca7aa87b1f5708f597075013c20d8359667
+refs/heads/master: 8057b9653923bd762d89ccb730c76cba40ce96f0
diff --git a/trunk/fs/ext3/namei.c b/trunk/fs/ext3/namei.c
index cc682ab55b73..b27ba71810ec 100644
--- a/trunk/fs/ext3/namei.c
+++ b/trunk/fs/ext3/namei.c
@@ -1038,7 +1038,7 @@ static struct dentry *ext3_lookup(struct inode * dir, struct dentry *dentry, str
 			return ERR_PTR(-EIO);
 		}
 		inode = ext3_iget(dir->i_sb, ino);
-		if (unlikely(IS_ERR(inode))) {
+		if (IS_ERR(inode)) {
 			if (PTR_ERR(inode) == -ESTALE) {
 				ext3_error(dir->i_sb, __func__,
 						"deleted inode referenced: %lu",