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>

diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index d68f230..9a4b50a 100644 (file)
--- 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 9f622fe..95745be 100644 (file)
--- 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);