diff mbox

fs/super.c: use && instead of & for warn_on condition

Message ID 1442848714-6784-1-git-send-email-vincent.stehle@freescale.com
State New
Headers show

Commit Message

Vincent Stehlé Sept. 21, 2015, 3:18 p.m. UTC
This fixes the following sparse warning:

  fs/super.c:1202:9: warning: dubious: x & !y

Bitwise and logical and are equivalent here, but logical was intended.
The generated code is identical, with and without CONFIG_LOCKDEP.

Signed-off-by: Vincent Stehlé <vincent.stehle@freescale.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: trivial@kernel.org
---
 fs/super.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Oleg Nesterov Sept. 21, 2015, 3:40 p.m. UTC | #1
On 09/21, Vincent Stehlé wrote:
>
> --- a/fs/super.c
> +++ b/fs/super.c
> @@ -1199,7 +1199,7 @@ int __sb_start_write(struct super_block *sb, int level, bool wait)
>  	else
>  		ret = percpu_down_read_trylock(sb->s_writers.rw_sem + level-1);
>
> -	WARN_ON(force_trylock & !ret);
> +	WARN_ON(force_trylock && !ret);

OOPS! yes, this is a typo, thanks! Harmless in this particular case,
but still.

Acked-by: Oleg Nesterov <oleg@redhat.com>

--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jiri Kosina Dec. 8, 2015, 1:51 p.m. UTC | #2
On Mon, 21 Sep 2015, Oleg Nesterov wrote:

> > --- a/fs/super.c
> > +++ b/fs/super.c
> > @@ -1199,7 +1199,7 @@ int __sb_start_write(struct super_block *sb, int level, bool wait)
> >  	else
> >  		ret = percpu_down_read_trylock(sb->s_writers.rw_sem + level-1);
> >
> > -	WARN_ON(force_trylock & !ret);
> > +	WARN_ON(force_trylock && !ret);
> 
> OOPS! yes, this is a typo, thanks! Harmless in this particular case,
> but still.
> 
> Acked-by: Oleg Nesterov <oleg@redhat.com>

Doesn't seem to be in linux-next as of today, so I am taking it now. 
Thanks,
diff mbox

Patch

diff --git a/fs/super.c b/fs/super.c
index 954aeb8..7ea56de 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -1199,7 +1199,7 @@  int __sb_start_write(struct super_block *sb, int level, bool wait)
 	else
 		ret = percpu_down_read_trylock(sb->s_writers.rw_sem + level-1);
 
-	WARN_ON(force_trylock & !ret);
+	WARN_ON(force_trylock && !ret);
 	return ret;
 }
 EXPORT_SYMBOL(__sb_start_write);