Commit a7bcb147 authored May 31, 2021 by Darrick J. Wong

xfs: clean up open-coded fs block unit conversions



Replace some open-coded fs block unit conversions with the standard
conversion macro.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>

parent 8124c8a6

fs/xfs/libxfs/xfs_inode_buf.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -612,7 +612,7 @@ xfs_inode_validate_extsize(
		*/

		if (rt_flag)
		blocksize_bytes = mp->m_sb.sb_rextsize << mp->m_sb.sb_blocklog;
		blocksize_bytes = XFS_FSB_TO_B(mp, mp->m_sb.sb_rextsize);
		else
		blocksize_bytes = mp->m_sb.sb_blocksize;

fs/xfs/xfs_iops.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -543,7 +543,7 @@ xfs_stat_blksize(
		* always return the realtime extent size.
		*/
		if (XFS_IS_REALTIME_INODE(ip))
		return xfs_get_extsz_hint(ip) << mp->m_sb.sb_blocklog;
		return XFS_FSB_TO_B(mp, xfs_get_extsz_hint(ip));

		/*
		* Allow large block sizes to be reported to userspace programs if the
		@@ -560,7 +560,7 @@ xfs_stat_blksize(
		*/
		if (mp->m_flags & XFS_MOUNT_LARGEIO) {
		if (mp->m_swidth)
		return mp->m_swidth << mp->m_sb.sb_blocklog;
		return XFS_FSB_TO_B(mp, mp->m_swidth);
		if (mp->m_flags & XFS_MOUNT_ALLOCSIZE)
		return 1U << mp->m_allocsize_log;
		}