linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ext3: Remove redundant unlikely()
@ 2010-12-09 14:39 Tobias Klauser
  2010-12-09 15:53 ` Lukas Czerner
  2011-01-06 15:44 ` Jan Kara
  0 siblings, 2 replies; 5+ messages in thread
From: Tobias Klauser @ 2010-12-09 14:39 UTC (permalink / raw)
  To: Jan Kara, Andrew Morton, Andreas Dilger, linux-ext4; +Cc: kernel-janitors

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

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
---
 fs/ext3/namei.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index bce9dce..268f776 100644
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -1047,7 +1047,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",
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] ext3: Remove redundant unlikely()
  2010-12-09 14:39 [PATCH] ext3: Remove redundant unlikely() Tobias Klauser
@ 2010-12-09 15:53 ` Lukas Czerner
  2010-12-09 16:01   ` Tobias Klauser
  2011-01-06 15:44 ` Jan Kara
  1 sibling, 1 reply; 5+ messages in thread
From: Lukas Czerner @ 2010-12-09 15:53 UTC (permalink / raw)
  To: Tobias Klauser
  Cc: Jan Kara, Andrew Morton, Andreas Dilger, linux-ext4,
	kernel-janitors

On Thu, 9 Dec 2010, Tobias Klauser wrote:

> IS_ERR() already implies unlikely(), so it can be omitted here.
> 
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
> ---
>  fs/ext3/namei.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
> index bce9dce..268f776 100644
> --- a/fs/ext3/namei.c
> +++ b/fs/ext3/namei.c
> @@ -1047,7 +1047,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",
> 

Good catch, but I guess the same thing may be done for ext2/4.

Thanks!

-Lukas


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] ext3: Remove redundant unlikely()
  2010-12-09 15:53 ` Lukas Czerner
@ 2010-12-09 16:01   ` Tobias Klauser
  2010-12-09 16:05     ` Lukas Czerner
  0 siblings, 1 reply; 5+ messages in thread
From: Tobias Klauser @ 2010-12-09 16:01 UTC (permalink / raw)
  To: Lukas Czerner
  Cc: Jan Kara, Andrew Morton, Andreas Dilger, linux-ext4,
	kernel-janitors

On 2010-12-09 at 16:53:38 +0100, Lukas Czerner <lczerner@redhat.com> wrote:
> On Thu, 9 Dec 2010, Tobias Klauser wrote:
> 
> > IS_ERR() already implies unlikely(), so it can be omitted here.
> > 
> > Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
> > ---
> >  fs/ext3/namei.c |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
> > index bce9dce..268f776 100644
> > --- a/fs/ext3/namei.c
> > +++ b/fs/ext3/namei.c
> > @@ -1047,7 +1047,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",
> > 
> 
> Good catch, but I guess the same thing may be done for ext2/4.

I did so actually [0], [1]. Unfortunately I didn't submit the three patches as a
series.

[0] http://lists.openwall.net/linux-ext4/2010/12/09/6
[1] http://lists.openwall.net/linux-ext4/2010/12/09/5

Cheers
Tobias

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] ext3: Remove redundant unlikely()
  2010-12-09 16:01   ` Tobias Klauser
@ 2010-12-09 16:05     ` Lukas Czerner
  0 siblings, 0 replies; 5+ messages in thread
From: Lukas Czerner @ 2010-12-09 16:05 UTC (permalink / raw)
  To: Tobias Klauser
  Cc: Lukas Czerner, Jan Kara, Andrew Morton, Andreas Dilger,
	linux-ext4, kernel-janitors

On Thu, 9 Dec 2010, Tobias Klauser wrote:

> On 2010-12-09 at 16:53:38 +0100, Lukas Czerner <lczerner@redhat.com> wrote:
> > On Thu, 9 Dec 2010, Tobias Klauser wrote:
> > 
> > > IS_ERR() already implies unlikely(), so it can be omitted here.
> > > 
> > > Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
> > > ---
> > >  fs/ext3/namei.c |    2 +-
> > >  1 files changed, 1 insertions(+), 1 deletions(-)
> > > 
> > > diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
> > > index bce9dce..268f776 100644
> > > --- a/fs/ext3/namei.c
> > > +++ b/fs/ext3/namei.c
> > > @@ -1047,7 +1047,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",
> > > 
> > 
> > Good catch, but I guess the same thing may be done for ext2/4.
> 
> I did so actually [0], [1]. Unfortunately I didn't submit the three patches as a
> series.
> 
> [0] http://lists.openwall.net/linux-ext4/2010/12/09/6
> [1] http://lists.openwall.net/linux-ext4/2010/12/09/5
> 
> Cheers
> Tobias
> 

Ok, my apologize. I saw only this one on the ext4 list.

-Lukas

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] ext3: Remove redundant unlikely()
  2010-12-09 14:39 [PATCH] ext3: Remove redundant unlikely() Tobias Klauser
  2010-12-09 15:53 ` Lukas Czerner
@ 2011-01-06 15:44 ` Jan Kara
  1 sibling, 0 replies; 5+ messages in thread
From: Jan Kara @ 2011-01-06 15:44 UTC (permalink / raw)
  To: Tobias Klauser
  Cc: Jan Kara, Andrew Morton, Andreas Dilger, linux-ext4,
	kernel-janitors

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

								Honza

> 
> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
> ---
>  fs/ext3/namei.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
> index bce9dce..268f776 100644
> --- a/fs/ext3/namei.c
> +++ b/fs/ext3/namei.c
> @@ -1047,7 +1047,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",
> -- 
> 1.7.0.4
> 
-- 
Jan Kara <jack@suse.cz>
SUSE Labs, CR

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2011-01-06 15:44 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-09 14:39 [PATCH] ext3: Remove redundant unlikely() Tobias Klauser
2010-12-09 15:53 ` Lukas Czerner
2010-12-09 16:01   ` Tobias Klauser
2010-12-09 16:05     ` Lukas Czerner
2011-01-06 15:44 ` Jan Kara

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).