Commit cebf9dac authored by Pankaj Raghav's avatar Pankaj Raghav Committed by Christian Brauner
Browse files

xfs: make the calculation generic in xfs_sb_validate_fsb_count() 



Instead of assuming that PAGE_SHIFT is always higher than the blocklog,
make the calculation generic so that page cache count can be calculated
correctly for LBS.

Signed-off-by: default avatarPankaj Raghav <p.raghav@samsung.com>
Link: https://lore.kernel.org/r/20240822135018.1931258-10-kernel@pankajraghav.com


Acked-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarDaniel Gomez <da.gomez@samsung.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 79012cfa

fs/xfs/xfs_mount.c

+6 −1
Original line number Diff line number Diff line
@@ -132,11 +132,16 @@ xfs_sb_validate_fsb_count( 
	xfs_sb_t	*sbp,

	uint64_t	nblocks)

{

	uint64_t		max_bytes;



	ASSERT(PAGE_SHIFT >= sbp->sb_blocklog);

	ASSERT(sbp->sb_blocklog >= BBSHIFT);



	if (check_shl_overflow(nblocks, sbp->sb_blocklog, &max_bytes))

		return -EFBIG;



	/* Limited by ULONG_MAX of page cache index */

	if (nblocks >> (PAGE_SHIFT - sbp->sb_blocklog) > ULONG_MAX)

	if (max_bytes >> PAGE_SHIFT > ULONG_MAX)

		return -EFBIG;

	return 0;

}