hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Eric Sandeen 2017-01-27 23:16:37 -08:00 committed by Darrick J. Wong
parent 566cf877a1
commit f88ae46b09
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/xfs/libxfs/xfs_bmap.c
View File

@ -743,7 +743,7 @@ xfs_bmap_extents_to_btree(
if (xfs_sb_version_hascrc(&mp->m_sb)) if (xfs_sb_version_hascrc(&mp->m_sb))
xfs_btree_init_block_int(mp, block, XFS_BUF_DADDR_NULL, xfs_btree_init_block_int(mp, block, XFS_BUF_DADDR_NULL,
XFS_BMAP_CRC_MAGIC, 1, 1, ip->i_ino, XFS_BMAP_CRC_MAGIC, 1, 1, ip->i_ino,
XFS_BTREE_LONG_PTRS | XFS_BTREE_CRC_BLOCKS); XFS_BTREE_LONG_PTRS);
else else
xfs_btree_init_block_int(mp, block, XFS_BUF_DADDR_NULL, xfs_btree_init_block_int(mp, block, XFS_BUF_DADDR_NULL,
XFS_BMAP_MAGIC, 1, 1, ip->i_ino, XFS_BMAP_MAGIC, 1, 1, ip->i_ino,
@ -820,7 +820,7 @@ try_another_ag:
if (xfs_sb_version_hascrc(&mp->m_sb)) if (xfs_sb_version_hascrc(&mp->m_sb))
xfs_btree_init_block_int(mp, ablock, abp->b_bn, xfs_btree_init_block_int(mp, ablock, abp->b_bn,
XFS_BMAP_CRC_MAGIC, 0, 0, ip->i_ino, XFS_BMAP_CRC_MAGIC, 0, 0, ip->i_ino,
XFS_BTREE_LONG_PTRS | XFS_BTREE_CRC_BLOCKS); XFS_BTREE_LONG_PTRS);
else else
xfs_btree_init_block_int(mp, ablock, abp->b_bn, xfs_btree_init_block_int(mp, ablock, abp->b_bn,
XFS_BMAP_MAGIC, 0, 0, ip->i_ino, XFS_BMAP_MAGIC, 0, 0, ip->i_ino,

2
fs/xfs/libxfs/xfs_bmap_btree.c
View File

@ -74,7 +74,7 @@ xfs_bmdr_to_bmbt(
if (xfs_sb_version_hascrc(&mp->m_sb)) if (xfs_sb_version_hascrc(&mp->m_sb))
xfs_btree_init_block_int(mp, rblock, XFS_BUF_DADDR_NULL, xfs_btree_init_block_int(mp, rblock, XFS_BUF_DADDR_NULL,
XFS_BMAP_CRC_MAGIC, 0, 0, ip->i_ino, XFS_BMAP_CRC_MAGIC, 0, 0, ip->i_ino,
XFS_BTREE_LONG_PTRS | XFS_BTREE_CRC_BLOCKS); XFS_BTREE_LONG_PTRS);
else else
xfs_btree_init_block_int(mp, rblock, XFS_BUF_DADDR_NULL, xfs_btree_init_block_int(mp, rblock, XFS_BUF_DADDR_NULL,
XFS_BMAP_MAGIC, 0, 0, ip->i_ino, XFS_BMAP_MAGIC, 0, 0, ip->i_ino,

6
fs/xfs/libxfs/xfs_btree.c
View File

@ -1090,6 +1090,8 @@ xfs_btree_init_block_int(
__u64 owner, __u64 owner,
unsigned int flags) unsigned int flags)
{ {
int crc = xfs_sb_version_hascrc(&mp->m_sb);
buf->bb_magic = cpu_to_be32(magic); buf->bb_magic = cpu_to_be32(magic);
buf->bb_level = cpu_to_be16(level); buf->bb_level = cpu_to_be16(level);
buf->bb_numrecs = cpu_to_be16(numrecs); buf->bb_numrecs = cpu_to_be16(numrecs);
@ -1097,7 +1099,7 @@ xfs_btree_init_block_int(
if (flags & XFS_BTREE_LONG_PTRS) { if (flags & XFS_BTREE_LONG_PTRS) {
buf->bb_u.l.bb_leftsib = cpu_to_be64(NULLFSBLOCK); buf->bb_u.l.bb_leftsib = cpu_to_be64(NULLFSBLOCK);
buf->bb_u.l.bb_rightsib = 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_blkno = cpu_to_be64(blkno);
buf->bb_u.l.bb_owner = cpu_to_be64(owner); buf->bb_u.l.bb_owner = cpu_to_be64(owner);
uuid_copy(&buf->bb_u.l.bb_uuid, &mp->m_sb.sb_meta_uuid); 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_leftsib = cpu_to_be32(NULLAGBLOCK);
buf->bb_u.s.bb_rightsib = 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_blkno = cpu_to_be64(blkno);
buf->bb_u.s.bb_owner = cpu_to_be32(__owner); buf->bb_u.s.bb_owner = cpu_to_be32(__owner);
uuid_copy(&buf->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid); uuid_copy(&buf->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid);

14
fs/xfs/xfs_fsops.c
View File

@ -354,7 +354,7 @@ xfs_growfs_data_private(
if (xfs_sb_version_hascrc(&mp->m_sb)) if (xfs_sb_version_hascrc(&mp->m_sb))
xfs_btree_init_block(mp, bp, XFS_ABTB_CRC_MAGIC, 0, 1, xfs_btree_init_block(mp, bp, XFS_ABTB_CRC_MAGIC, 0, 1,
agno, XFS_BTREE_CRC_BLOCKS); agno, 0);
else else
xfs_btree_init_block(mp, bp, XFS_ABTB_MAGIC, 0, 1, xfs_btree_init_block(mp, bp, XFS_ABTB_MAGIC, 0, 1,
agno, 0); agno, 0);
@ -383,7 +383,7 @@ xfs_growfs_data_private(
if (xfs_sb_version_hascrc(&mp->m_sb)) if (xfs_sb_version_hascrc(&mp->m_sb))
xfs_btree_init_block(mp, bp, XFS_ABTC_CRC_MAGIC, 0, 1, xfs_btree_init_block(mp, bp, XFS_ABTC_CRC_MAGIC, 0, 1,
agno, XFS_BTREE_CRC_BLOCKS); agno, 0);
else else
xfs_btree_init_block(mp, bp, XFS_ABTC_MAGIC, 0, 1, xfs_btree_init_block(mp, bp, XFS_ABTC_MAGIC, 0, 1,
agno, 0); agno, 0);
@ -414,7 +414,7 @@ xfs_growfs_data_private(
} }
xfs_btree_init_block(mp, bp, XFS_RMAP_CRC_MAGIC, 0, 0, xfs_btree_init_block(mp, bp, XFS_RMAP_CRC_MAGIC, 0, 0,
agno, XFS_BTREE_CRC_BLOCKS); agno, 0);
block = XFS_BUF_TO_BLOCK(bp); block = XFS_BUF_TO_BLOCK(bp);
@ -490,7 +490,7 @@ xfs_growfs_data_private(
if (xfs_sb_version_hascrc(&mp->m_sb)) if (xfs_sb_version_hascrc(&mp->m_sb))
xfs_btree_init_block(mp, bp, XFS_IBT_CRC_MAGIC, 0, 0, xfs_btree_init_block(mp, bp, XFS_IBT_CRC_MAGIC, 0, 0,
agno, XFS_BTREE_CRC_BLOCKS); agno, 0);
else else
xfs_btree_init_block(mp, bp, XFS_IBT_MAGIC, 0, 0, xfs_btree_init_block(mp, bp, XFS_IBT_MAGIC, 0, 0,
agno, 0); agno, 0);
@ -515,8 +515,7 @@ xfs_growfs_data_private(
if (xfs_sb_version_hascrc(&mp->m_sb)) if (xfs_sb_version_hascrc(&mp->m_sb))
xfs_btree_init_block(mp, bp, XFS_FIBT_CRC_MAGIC, xfs_btree_init_block(mp, bp, XFS_FIBT_CRC_MAGIC,
0, 0, agno, 0, 0, agno, 0);
XFS_BTREE_CRC_BLOCKS);
else else
xfs_btree_init_block(mp, bp, XFS_FIBT_MAGIC, 0, xfs_btree_init_block(mp, bp, XFS_FIBT_MAGIC, 0,
0, agno, 0); 0, agno, 0);
@ -541,8 +540,7 @@ xfs_growfs_data_private(
} }
xfs_btree_init_block(mp, bp, XFS_REFC_CRC_MAGIC, xfs_btree_init_block(mp, bp, XFS_REFC_CRC_MAGIC,
0, 0, agno, 0, 0, agno, 0);
XFS_BTREE_CRC_BLOCKS);
error = xfs_bwrite(bp); error = xfs_bwrite(bp);
xfs_buf_relse(bp); xfs_buf_relse(bp);