2010-12-09 14:48:21

by Tobias Klauser

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

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

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

diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c
index f8aecd2..2e1d834 100644
--- a/fs/ext2/namei.c
+++ b/fs/ext2/namei.c
@@ -67,7 +67,7 @@ static struct dentry *ext2_lookup(struct inode * dir, struct dentry *dentry, str
inode = NULL;
if (ino) {
inode = ext2_iget(dir->i_sb, ino);
- if (unlikely(IS_ERR(inode))) {
+ if (IS_ERR(inode)) {
if (PTR_ERR(inode) == -ESTALE) {
ext2_error(dir->i_sb, __func__,
"deleted inode referenced: %lu",
--
1.7.0.4

2011-01-06 15:44:28

by Jan Kara

Subject: Re: [PATCH] ext2: Remove redundant unlikely()

On Thu 09-12-10 15:39:00, Tobias Klauser wrote:
> IS_ERR() already implies unlikely(), so it can be omitted here.
Thanks. Merged.

Honza

>
> Signed-off-by: Tobias Klauser <[email protected]>
> ---
> fs/ext2/namei.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/fs/ext2/namei.c b/fs/ext2/namei.c
> index f8aecd2..2e1d834 100644
> --- a/fs/ext2/namei.c
> +++ b/fs/ext2/namei.c
> @@ -67,7 +67,7 @@ static struct dentry *ext2_lookup(struct inode * dir, struct dentry *dentry, str
> inode = NULL;
> if (ino) {
> inode = ext2_iget(dir->i_sb, ino);
> - if (unlikely(IS_ERR(inode))) {
> + if (IS_ERR(inode)) {
> if (PTR_ERR(inode) == -ESTALE) {
> ext2_error(dir->i_sb, __func__,
> "deleted inode referenced: %lu",
> --
> 1.7.0.4
>
--
Jan Kara <[email protected]>
SUSE Labs, CR