diff options
| author | Nathan Scott <nathans@sgi.com> | 2006-09-28 11:03:53 +1000 |
|---|---|---|
| committer | Tim Shimmin <tes@sgi.com> | 2006-09-28 11:03:53 +1000 |
| commit | 68c3271515f11f6665dc8732e53aaab3d3fdd7d3 (patch) | |
| tree | 18d8c9996da0666efbf8bb1edbb7ad5b1011f491 | |
| parent | d432c80e68e3c283fc9a85021f5b65e0aabf254e (diff) | |
| download | kernel_samsung_smdk4412-68c3271515f11f6665dc8732e53aaab3d3fdd7d3.zip kernel_samsung_smdk4412-68c3271515f11f6665dc8732e53aaab3d3fdd7d3.tar.gz kernel_samsung_smdk4412-68c3271515f11f6665dc8732e53aaab3d3fdd7d3.tar.bz2 | |
[XFS] Fix a porting botch on the realtime subvol growfs code path.
SGI-PV: 955515
SGI-Modid: xfs-linux-melb:xfs-kern:26806a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_linux.h | 7 | ||||
| -rw-r--r-- | fs/xfs/xfs_rtalloc.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_linux.h b/fs/xfs/linux-2.6/xfs_linux.h index 14d8402..2b0e001 100644 --- a/fs/xfs/linux-2.6/xfs_linux.h +++ b/fs/xfs/linux-2.6/xfs_linux.h @@ -332,4 +332,11 @@ static inline __uint64_t roundup_64(__uint64_t x, __uint32_t y) return(x * y); } +static inline __uint64_t howmany_64(__uint64_t x, __uint32_t y) +{ + x += y - 1; + do_div(x, y); + return x; +} + #endif /* __XFS_LINUX__ */ diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c index e050987..880c732 100644 --- a/fs/xfs/xfs_rtalloc.c +++ b/fs/xfs/xfs_rtalloc.c @@ -1948,7 +1948,7 @@ xfs_growfs_rt( */ nrextents = nrblocks; do_div(nrextents, in->extsize); - nrbmblocks = roundup_64(nrextents, NBBY * sbp->sb_blocksize); + nrbmblocks = howmany_64(nrextents, NBBY * sbp->sb_blocksize); nrextslog = xfs_highbit32(nrextents); nrsumlevels = nrextslog + 1; nrsumsize = (uint)sizeof(xfs_suminfo_t) * nrsumlevels * nrbmblocks; |