xfs_db: use precomputed inode geometry values

Use the precomputed inode geometry values instead of open-coding them.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/db/inode.c b/db/inode.c
index 73dd118db610442a7f3cebcc65b5c3c36e812fe6..d8d69ffbd2e9b37d21e8618a290aa02f5f63f86e 100644 (file)
--- a/db/inode.c
+++ b/db/inode.c
@@ -657,16 +657,14 @@ set_cur_inode(
            igeo->inoalign_mask) {
                xfs_agblock_t   chunk_agbno;
                xfs_agblock_t   offset_agbno;
-               int             blks_per_cluster;
 
-               blks_per_cluster = igeo->inode_cluster_size >>
-                                                       mp->m_sb.sb_blocklog;
                offset_agbno = agbno & igeo->inoalign_mask;
                chunk_agbno = agbno - offset_agbno;
                cluster_agbno = chunk_agbno +
-                       ((offset_agbno / blks_per_cluster) * blks_per_cluster);
+                       ((offset_agbno / M_IGEO(mp)->blocks_per_cluster) *
+                        M_IGEO(mp)->blocks_per_cluster);
                offset += ((agbno - cluster_agbno) * mp->m_sb.sb_inopblock);
-               numblks = XFS_FSB_TO_BB(mp, blks_per_cluster);
+               numblks = XFS_FSB_TO_BB(mp, M_IGEO(mp)->blocks_per_cluster);
        } else
                cluster_agbno = agbno;
 

diff --git a/repair/dinode.c b/repair/dinode.c
index 56992dd2d3331183317f43fe1f9e15953c2e0832..f5e88cc3011214da24bc2a8bc7415e1f909eb168 100644 (file)
--- a/repair/dinode.c
+++ b/repair/dinode.c
@@ -768,7 +768,7 @@ get_agino_buf(
         * we must find the buffer for its cluster, add the appropriate
         * offset, and return that.
         */
-       cluster_size = max(igeo->inode_cluster_size, mp->m_sb.sb_blocksize);
+       cluster_size = igeo->inode_cluster_size;
        ino_per_cluster = cluster_size / mp->m_sb.sb_inodesize;
        cluster_agino = agino & ~(ino_per_cluster - 1);
        cluster_blks = XFS_FSB_TO_DADDR(mp, max(1,