xfs: Fix 64-bit division on 32-bit in xlog_state_switch_iclogs()
authorGeert Uytterhoeven <geert@linux-m68k.org>
Fri, 18 Jun 2021 15:24:04 +0000 (08:24 -0700)
committerDarrick J. Wong <djwong@kernel.org>
Fri, 18 Jun 2021 15:24:19 +0000 (08:24 -0700)
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>
fs/xfs/xfs_log.c

index 0e563ff..0c91da5 100644 (file)
@@ -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) {