diff options
| author | Julia Lawall <julia@diku.dk> | 2009-07-27 18:15:25 +0200 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-08-31 14:46:22 -0500 |
| commit | a0f7bfd3429fc48f4d1aa5364b9428d75798ba04 (patch) | |
| tree | ebe8965e3c4337c5287daac4cb51c21e83239fc2 | |
| parent | eb00457d624c70a2492c319e7e05ed7e067b2794 (diff) | |
| download | linux-stable-a0f7bfd3429fc48f4d1aa5364b9428d75798ba04.tar.gz linux-stable-a0f7bfd3429fc48f4d1aa5364b9428d75798ba04.tar.bz2 linux-stable-a0f7bfd3429fc48f4d1aa5364b9428d75798ba04.zip | |
fs/xfs: Correct redundant test
bp was tested for NULL a few lines before, followed by a return, and there
is no intervening modification of its value.
A simplified version of the semantic match that finds this problem is as
follows: (http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@r exists@
local idexpression x;
expression E;
position p1,p2;
@@
if (x == NULL || ...) { ... when forall
return ...; }
... when != \(x=E\|x--\|x++\|--x\|++x\|x-=E\|x+=E\|x|=E\|x&=E\|&x\)
(
*x == NULL
|
*x != NULL
)
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Acked-by: Felix Blyakher <felixb@sgi.com>
Signed-off-by: Felix Blyakher <felixb@sgi.com>
| -rw-r--r-- | fs/xfs/xfs_trans_buf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_trans_buf.c b/fs/xfs/xfs_trans_buf.c index 8ee2f8c8b0a6..218829e6a152 100644 --- a/fs/xfs/xfs_trans_buf.c +++ b/fs/xfs/xfs_trans_buf.c @@ -307,7 +307,7 @@ xfs_trans_read_buf( return (flags & XFS_BUF_TRYLOCK) ? EAGAIN : XFS_ERROR(ENOMEM); - if ((bp != NULL) && (XFS_BUF_GETERROR(bp) != 0)) { + if (XFS_BUF_GETERROR(bp) != 0) { xfs_ioerror_alert("xfs_trans_read_buf", mp, bp, blkno); error = XFS_BUF_GETERROR(bp); @@ -315,7 +315,7 @@ xfs_trans_read_buf( return error; } #ifdef DEBUG - if (xfs_do_error && (bp != NULL)) { + if (xfs_do_error) { if (xfs_error_target == target) { if (((xfs_req_num++) % xfs_error_mod) == 0) { xfs_buf_relse(bp); |