Commit 4f1adf33 authored by Eric Sandeen's avatar Eric Sandeen Committed by Darrick J. Wong

xfs: more do_div cleanups

On some architectures do_div does the pointer compare
trick to make sure that we've sent it an unsigned 64-bit
number.  (Why unsigned?  I don't know.)

Fix up the few places that squawk about this; in
xfs_bmap_wants_extents() we just used a bare int64_t so change
that to unsigned.

In xfs_adjust_extent_unmap_boundaries() all we wanted was the
mod, and we have an xfs-specific function to handle that w/o
side effects, which includes proper casting for do_div.

In xfs_daddr_to_ag[b]no, we were using the wrong type anyway;
XFS_BB_TO_FSBT returns a block in the filesystem, so use
xfs_rfsblock_t not xfs_daddr_t, and gain the unsignedness
from that type as a bonus.
Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 90115407
...@@ -4887,7 +4887,7 @@ xfs_bmap_del_extent_delay( ...@@ -4887,7 +4887,7 @@ xfs_bmap_del_extent_delay(
ASSERT(got_endoff >= del_endoff); ASSERT(got_endoff >= del_endoff);
if (isrt) { 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); do_div(rtexts, mp->m_sb.sb_rextsize);
xfs_mod_frextents(mp, rtexts); xfs_mod_frextents(mp, rtexts);
......
...@@ -1206,11 +1206,8 @@ xfs_adjust_extent_unmap_boundaries( ...@@ -1206,11 +1206,8 @@ xfs_adjust_extent_unmap_boundaries(
return error; return error;
if (nimap && imap.br_startblock != HOLESTARTBLOCK) { if (nimap && imap.br_startblock != HOLESTARTBLOCK) {
xfs_daddr_t block;
ASSERT(imap.br_startblock != DELAYSTARTBLOCK); ASSERT(imap.br_startblock != DELAYSTARTBLOCK);
block = imap.br_startblock; mod = do_mod(imap.br_startblock, mp->m_sb.sb_rextsize);
mod = do_div(block, mp->m_sb.sb_rextsize);
if (mod) if (mod)
*startoffset_fsb += mp->m_sb.sb_rextsize - mod; *startoffset_fsb += mp->m_sb.sb_rextsize - mod;
} }
......
...@@ -313,7 +313,7 @@ void xfs_do_force_shutdown(struct xfs_mount *mp, int flags, char *fname, ...@@ -313,7 +313,7 @@ void xfs_do_force_shutdown(struct xfs_mount *mp, int flags, char *fname,
static inline xfs_agnumber_t static inline xfs_agnumber_t
xfs_daddr_to_agno(struct xfs_mount *mp, xfs_daddr_t d) 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); do_div(ld, mp->m_sb.sb_agblocks);
return (xfs_agnumber_t) ld; return (xfs_agnumber_t) ld;
} }
...@@ -321,7 +321,7 @@ xfs_daddr_to_agno(struct xfs_mount *mp, xfs_daddr_t d) ...@@ -321,7 +321,7 @@ xfs_daddr_to_agno(struct xfs_mount *mp, xfs_daddr_t d)
static inline xfs_agblock_t static inline xfs_agblock_t
xfs_daddr_to_agbno(struct xfs_mount *mp, xfs_daddr_t d) 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); return (xfs_agblock_t) do_div(ld, mp->m_sb.sb_agblocks);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment