[PATCH-2.4] jfs: incorrect use of "&&" instead of "&"

[PATCH-2.4] jfs: incorrect use of "&&" instead of "&"

[Willy Tarreau]

Hi Dave,

I'm about to merge this fix in 2.4. It's already in 2.6 BTW.
Do you have any objection ?

Thanks in advance,
Willy

>From b14cb91c6621908f8e957aad5a85d6c41b31dfea Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@1wt.eu>
Date: Sat, 25 Nov 2006 21:57:26 +0100
Subject: [PATCH] jfs: incorrect use of "&&" instead of "&"

in jfs_txnmgr, the use of "tblk->flag && COMMIT_DELETE" in a
if() condition is obviously wrong. This bug has already been
fixed in 2.6.

Signed-off-by: Willy Tarreau <w@1wt.eu>
---
 fs/jfs/jfs_txnmgr.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index 62e6493..4e6a280 100644
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -1175,7 +1175,7 @@ int txCommit(tid_t tid,		/* transaction 
 		jfs_ip = JFS_IP(ip);
 
 		if (test_and_clear_cflag(COMMIT_Syncdata, ip) &&
-		    ((tblk->flag && COMMIT_DELETE) == 0))
+		    ((tblk->flag & COMMIT_DELETE) == 0))
 			fsync_inode_data_buffers(ip);
 
 		/*
-- 
1.4.2.4

Re: [PATCH-2.4] jfs: incorrect use of "&&" instead of "&"

[Dave Kleikamp]

On Sat, 2006-11-25 at 22:24 +0100, Willy Tarreau wrote:
> Hi Dave,
> 
> I'm about to merge this fix in 2.4. It's already in 2.6 BTW.
> Do you have any objection ?

No objection.

> 
> Thanks in advance,
> Willy
> 
> From b14cb91c6621908f8e957aad5a85d6c41b31dfea Mon Sep 17 00:00:00 2001
> From: Willy Tarreau <w@1wt.eu>
> Date: Sat, 25 Nov 2006 21:57:26 +0100
> Subject: [PATCH] jfs: incorrect use of "&&" instead of "&"
> 
> in jfs_txnmgr, the use of "tblk->flag && COMMIT_DELETE" in a
> if() condition is obviously wrong. This bug has already been
> fixed in 2.6.
> 
> Signed-off-by: Willy Tarreau <w@1wt.eu>
Acked-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>

> ---
>  fs/jfs/jfs_txnmgr.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
> index 62e6493..4e6a280 100644
> --- a/fs/jfs/jfs_txnmgr.c
> +++ b/fs/jfs/jfs_txnmgr.c
> @@ -1175,7 +1175,7 @@ int txCommit(tid_t tid,		/* transaction 
>  		jfs_ip = JFS_IP(ip);
>  
>  		if (test_and_clear_cflag(COMMIT_Syncdata, ip) &&
> -		    ((tblk->flag && COMMIT_DELETE) == 0))
> +		    ((tblk->flag & COMMIT_DELETE) == 0))
>  			fsync_inode_data_buffers(ip);
>  
>  		/*
-- 
David Kleikamp
IBM Linux Technology Center

Re: [PATCH-2.4] jfs: incorrect use of "&&" instead of "&"

[Willy Tarreau]

On Sat, Nov 25, 2006 at 02:43:41PM -0600, Dave Kleikamp wrote:
> On Sat, 2006-11-25 at 22:24 +0100, Willy Tarreau wrote:
> > Hi Dave,
> > 
> > I'm about to merge this fix in 2.4. It's already in 2.6 BTW.
> > Do you have any objection ?
> 
> No objection.

Thanks, applied.
Willy