2010-12-09 14:48:21

by Tobias Klauser

Subject: [PATCH] ext4: Remove redundant unlikely()

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

Signed-off-by: Tobias Klauser <[email protected]>
---
fs/ext4/namei.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 92203b8..cec88ce 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",
--
1.7.0.4

2010-12-20 02:40:07

by Theodore Ts'o

Subject: Re: ext4: Remove redundant unlikely()

On Thu, Dec 09, 2010 at 04:40:38AM -0000, Tobias Klauser wrote:
> IS_ERR() already implies unlikely(), so it can be omitted here.
>
> Signed-off-by: Tobias Klauser <[email protected]>

Thanks, added to ext4 patch queue.

- Ted