From: Tobias Klauser <tklauser@distanz.ch>
Date: Mon, 20 Dec 2010 02:38:46 +0000 (-0500)
Subject: ext4: Remove redundant unlikely()
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6ca7b13dea385484e2fcc89790b8030697c5014a;p=openwrt%2Fstaging%2Fblogic.git

ext4: Remove redundant unlikely()

IS_ERR() already implies unlikely(), so it can be omitted here.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index dc40e75cba88..203086498caa 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -1036,7 +1036,7 @@ static struct dentry *ext4_lookup(struct inode *dir, struct dentry *dentry, stru
 			return ERR_PTR(-EIO);
 		}
 		inode = ext4_iget(dir->i_sb, ino);
-		if (unlikely(IS_ERR(inode))) {
+		if (IS_ERR(inode)) {
 			if (PTR_ERR(inode) == -ESTALE) {
 				EXT4_ERROR_INODE(dir,
 						 "deleted inode referenced: %u",