3 files changed, 4 insertions, 7 deletions

diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index 7f42f6067eb5..0fdff08145c1 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -4887,7 +4887,7 @@ xfs_bmap_del_extent_delay(
         ASSERT(got_endoff >= del_endoff);
 
         if (isrt) {
-                int64_t rtexts = XFS_FSB_TO_B(mp, del->br_blockcount);
+                uint64_t rtexts = XFS_FSB_TO_B(mp, del->br_blockcount);
 
                 do_div(rtexts, mp->m_sb.sb_rextsize);
                 xfs_mod_frextents(mp, rtexts);
diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
index de94798f1c1b..7ac80a1facf2 100644
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -1206,11 +1206,8 @@ xfs_adjust_extent_unmap_boundaries(
                 return error;
 
         if (nimap && imap.br_startblock != HOLESTARTBLOCK) {
-                xfs_daddr_t     block;
-
                 ASSERT(imap.br_startblock != DELAYSTARTBLOCK);
-                block = imap.br_startblock;
-                mod = do_div(block, mp->m_sb.sb_rextsize);
+                mod = do_mod(imap.br_startblock, mp->m_sb.sb_rextsize);
                 if (mod)
                         *startoffset_fsb += mp->m_sb.sb_rextsize - mod;
         }
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
index 22b2185e93a0..9fa312a41c93 100644
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -313,7 +313,7 @@ void xfs_do_force_shutdown(struct xfs_mount *mp, int flags, char *fname,
 static inline xfs_agnumber_t
 xfs_daddr_to_agno(struct xfs_mount *mp, xfs_daddr_t d)
 {
-        xfs_daddr_t ld = XFS_BB_TO_FSBT(mp, d);
+        xfs_rfsblock_t ld = XFS_BB_TO_FSBT(mp, d);
         do_div(ld, mp->m_sb.sb_agblocks);
         return (xfs_agnumber_t) ld;
 }
@@ -321,7 +321,7 @@ xfs_daddr_to_agno(struct xfs_mount *mp, xfs_daddr_t d)
 static inline xfs_agblock_t
 xfs_daddr_to_agbno(struct xfs_mount *mp, xfs_daddr_t d)
 {
-        xfs_daddr_t ld = XFS_BB_TO_FSBT(mp, d);
+        xfs_rfsblock_t ld = XFS_BB_TO_FSBT(mp, d);
         return (xfs_agblock_t) do_div(ld, mp->m_sb.sb_agblocks);
 }