From: Darrick J. Wong <djwong@kernel.org>
Date: Fri, 15 Oct 2021 20:28:25 +0000 (-0400)
Subject: xfs: clean up open-coded fs block unit conversions
X-Git-Tag: libxfs-5.14-sync_2021-10-16~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d211aaa21d7a6931468e7e3fa935cc7d58f39b0;p=thirdparty%2Fxfsprogs-dev.git

xfs: clean up open-coded fs block unit conversions

Source kernel commit: a7bcb147fef39054fe324a1a988470f5da127196

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>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/libxfs/xfs_inode_buf.c b/libxfs/xfs_inode_buf.c
index a9ed7f246..70caf6e76 100644
--- a/libxfs/xfs_inode_buf.c
+++ b/libxfs/xfs_inode_buf.c
@@ -609,7 +609,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;