diff options
| author | Dave Chinner | 2018-06-08 18:54:22 +0200 |
|---|---|---|
| committer | Darrick J. Wong | 2018-06-08 19:07:52 +0200 |
| commit | 0703a8e1c17e2cba742eafe640be3b60f77352c4 (patch) | |
| tree | f52e7880cb8e77ef601a5937b1586271e2389b9b /fs/xfs/xfs_rtalloc.c | |
| parent | xfs: don't call xfs_da_shrink_inode with NULL bp (diff) | |
| download | kernel-qcow2-linux-0703a8e1c17e2cba742eafe640be3b60f77352c4.tar.gz kernel-qcow2-linux-0703a8e1c17e2cba742eafe640be3b60f77352c4.tar.xz kernel-qcow2-linux-0703a8e1c17e2cba742eafe640be3b60f77352c4.zip | |
xfs: replace do_mod with native operations
do_mod() is a hold-over from when we have different sizes for file
offsets and and other internal values for 40 bit XFS filesystems.
Hence depending on build flags variables passed to do_mod() could
change size. We no longer support those small format filesystems and
hence everything is of fixed size theses days, even on 32 bit
platforms.
As such, we can convert all the do_mod() callers to platform
optimised modulus operations as defined by linux/math64.h.
Individual conversions depend on the types of variables being used.
Signed-Off-By: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Diffstat (limited to 'fs/xfs/xfs_rtalloc.c')
| -rw-r--r-- | fs/xfs/xfs_rtalloc.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c index 80bbfe604ce0..329d4d26c13e 100644 --- a/fs/xfs/xfs_rtalloc.c +++ b/fs/xfs/xfs_rtalloc.c @@ -301,8 +301,12 @@ xfs_rtallocate_extent_block( /* * If size should be a multiple of prod, make that so. */ - if (prod > 1 && (p = do_mod(bestlen, prod))) - bestlen -= p; + if (prod > 1) { + div_u64_rem(bestlen, prod, &p); + if (p) + bestlen -= p; + } + /* * Allocate besti for bestlen & return that. */ @@ -1263,7 +1267,7 @@ xfs_rtpick_extent( b = (mp->m_sb.sb_rextents * ((resid << 1) + 1ULL)) >> (log2 + 1); if (b >= mp->m_sb.sb_rextents) - b = do_mod(b, mp->m_sb.sb_rextents); + div64_u64_rem(b, mp->m_sb.sb_rextents, &b); if (b + len > mp->m_sb.sb_rextents) b = mp->m_sb.sb_rextents - len; } |