diff options
| author | Markus Elfring <elfring@users.sourceforge.net> | 2014-11-30 22:24:20 +0100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-11-30 22:24:20 +0100 |
| commit | d2a5e3c6fccb25234a594bacb056e0b3974faf49 (patch) | |
| tree | e7ba3c65936adaf6458bf19359b27c975a1b4eee | |
| parent | Linux 3.18-rc2 (diff) | |
| download | linux-d2a5e3c6fccb25234a594bacb056e0b3974faf49.tar.xz linux-d2a5e3c6fccb25234a594bacb056e0b3974faf49.zip | |
xfs: remove unnecessary null checks
The functions xfs_blkdev_put() and xfs_qm_dqrele() test whether
their argument is NULL and then return immediately. Thus the test
around the call is not needed.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
| -rw-r--r-- | fs/xfs/xfs_qm.c | 12 | ||||
| -rw-r--r-- | fs/xfs/xfs_super.c | 3 |
2 files changed, 6 insertions, 9 deletions
diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c index d68f23021af3..9a4b50a411f3 100644 --- a/fs/xfs/xfs_qm.c +++ b/fs/xfs/xfs_qm.c @@ -1749,23 +1749,21 @@ xfs_qm_vop_dqalloc( xfs_iunlock(ip, lockflags); if (O_udqpp) *O_udqpp = uq; - else if (uq) + else xfs_qm_dqrele(uq); if (O_gdqpp) *O_gdqpp = gq; - else if (gq) + else xfs_qm_dqrele(gq); if (O_pdqpp) *O_pdqpp = pq; - else if (pq) + else xfs_qm_dqrele(pq); return 0; error_rele: - if (gq) - xfs_qm_dqrele(gq); - if (uq) - xfs_qm_dqrele(uq); + xfs_qm_dqrele(gq); + xfs_qm_dqrele(uq); return error; } diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index 9f622feda6a4..95745be3ab47 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -796,8 +796,7 @@ xfs_open_devices( out_free_ddev_targ: xfs_free_buftarg(mp, mp->m_ddev_targp); out_close_rtdev: - if (rtdev) - xfs_blkdev_put(rtdev); + xfs_blkdev_put(rtdev); out_close_logdev: if (logdev && logdev != ddev) xfs_blkdev_put(logdev); |