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

Commit ab6978c2 authored by Eric Sandeen's avatar Eric Sandeen Committed by Dave Chinner
Browse files

xfs: remove rbpp check from xfs_rtmodify_summary_int 



rbpp is always passed into xfs_rtmodify_summary
and xfs_rtget_summary, so there is no need to
test for it in xfs_rtmodify_summary_int.

Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent afabfd30

fs/xfs/libxfs/xfs_rtbitmap.c

+5 −13
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ xfs_rtmodify_summary_int( 
	/*

	 * If we have an old buffer, and the block number matches, use that.

	 */

	if (rbpp && *rbpp && *rsb == sb)

	if (*rbpp && *rsb == sb)

		bp = *rbpp;

	/*

	 * Otherwise we have to get the buffer.
@@ -469,7 +469,7 @@ xfs_rtmodify_summary_int( 
		/*

		 * If there was an old one, get rid of it first.

		 */

		if (rbpp && *rbpp)

		if (*rbpp)

			xfs_trans_brelse(tp, *rbpp);

		error = xfs_rtbuf_get(mp, tp, sb, 1, &bp);

		if (error) {
@@ -478,11 +478,9 @@ xfs_rtmodify_summary_int( 
		/*

		 * Remember this buffer and block for the next call.

		 */

		if (rbpp) {

		*rbpp = bp;

		*rsb = sb;

	}

	}

	/*

	 * Point to the summary information, modify/log it, and/or copy it out.

	 */
@@ -493,14 +491,8 @@ xfs_rtmodify_summary_int( 
		*sp += delta;

		xfs_trans_log_buf(tp, bp, first, first + sizeof(*sp) - 1);

	}

	if (sum) {

		/*

		 * Drop the buffer if we're not asked to remember it.

		 */

		if (!rbpp)

			xfs_trans_brelse(tp, bp);

	if (sum)

		*sum = *sp;

	}

	return 0;

}