Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2a5e3c6 authored Dec 01, 2014 by Markus Elfring Committed by Dave Chinner Dec 01, 2014

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>

parent cac7f242

fs/xfs/xfs_qm.c

+5 −7

Original line number	Diff line number	Diff line
		@@ -1749,22 +1749,20 @@ 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);
		return error;
		}

fs/xfs/xfs_super.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -796,7 +796,6 @@ xfs_open_devices(
		out_free_ddev_targ:
		xfs_free_buftarg(mp, mp->m_ddev_targp);
		out_close_rtdev:
		if (rtdev)
		xfs_blkdev_put(rtdev);
		out_close_logdev:
		if (logdev && logdev != ddev)