Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68c32715 authored by Nathan Scott's avatar Nathan Scott Committed by Tim Shimmin
Browse files

[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: default avatarNathan Scott <nathans@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent d432c80e

fs/xfs/linux-2.6/xfs_linux.h

+7 −0
Original line number Diff line number Diff line
@@ -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__ */

fs/xfs/xfs_rtalloc.c

+1 −1
Original line number Diff line number Diff line
@@ -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;