xfs: glean crc status from mp not flags in xfs_btree_init_block_int

xfs_btree_init_block_int() can determine whether crcs are
in effect without the passed-in XFS_BTREE_CRC_BLOCKS flag;
the mp argument allows us to determine this from the
superblock.  Remove the flag from callers, and use
xfs_sb_version_hascrc(&mp->m_sb) internally instead.

This removes one difference between the if & else cases
in the callers.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/fs/xfs/libxfs/xfs_btree.c b/fs/xfs/libxfs/xfs_btree.c
index 21e6a6ab6b9a..c91823c202b6 100644
--- a/fs/xfs/libxfs/xfs_btree.c
+++ b/fs/xfs/libxfs/xfs_btree.c
@@ -1090,6 +1090,8 @@ xfs_btree_init_block_int(
         __u64                   owner,
         unsigned int            flags)
 {
+        int                     crc = xfs_sb_version_hascrc(&mp->m_sb);
+
         buf->bb_magic = cpu_to_be32(magic);
         buf->bb_level = cpu_to_be16(level);
         buf->bb_numrecs = cpu_to_be16(numrecs);
@@ -1097,7 +1099,7 @@ xfs_btree_init_block_int(
         if (flags & XFS_BTREE_LONG_PTRS) {
                 buf->bb_u.l.bb_leftsib = cpu_to_be64(NULLFSBLOCK);
                 buf->bb_u.l.bb_rightsib = cpu_to_be64(NULLFSBLOCK);
-                if (flags & XFS_BTREE_CRC_BLOCKS) {
+                if (crc) {
                         buf->bb_u.l.bb_blkno = cpu_to_be64(blkno);
                         buf->bb_u.l.bb_owner = cpu_to_be64(owner);
                         uuid_copy(&buf->bb_u.l.bb_uuid, &mp->m_sb.sb_meta_uuid);
@@ -1110,7 +1112,7 @@ xfs_btree_init_block_int(
 
                 buf->bb_u.s.bb_leftsib = cpu_to_be32(NULLAGBLOCK);
                 buf->bb_u.s.bb_rightsib = cpu_to_be32(NULLAGBLOCK);
-                if (flags & XFS_BTREE_CRC_BLOCKS) {
+                if (crc) {
                         buf->bb_u.s.bb_blkno = cpu_to_be64(blkno);
                         buf->bb_u.s.bb_owner = cpu_to_be32(__owner);
                         uuid_copy(&buf->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid);