Commit 18842e0a authored Jun 18, 2021 by Geert Uytterhoeven Committed by Darrick J. Wong Jun 18, 2021

xfs: Fix 64-bit division on 32-bit in xlog_state_switch_iclogs()



On 32-bit (e.g. m68k):

    ERROR: modpost: "__udivdi3" [fs/xfs/xfs.ko] undefined!

Fix this by using a uint32_t intermediate, like before.

Reported-by:  <noreply@ellerman.id.au>
Fixes: 7660a5b48fbef958 ("xfs: log stripe roundoff is a property of the log")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>

parent a6a65fef

fs/xfs/xfs_log.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -3143,8 +3143,8 @@ xlog_state_switch_iclogs(

		/* Round up to next log-sunit */
		if (log->l_iclog_roundoff > BBSIZE) {
		log->l_curr_block = roundup(log->l_curr_block,
		BTOBB(log->l_iclog_roundoff));
		uint32_t sunit_bb = BTOBB(log->l_iclog_roundoff);
		log->l_curr_block = roundup(log->l_curr_block, sunit_bb);
		}

		if (log->l_curr_block >= log->l_logBBsize) {