Commit 97383de0 authored by Dave Chinner's avatar Dave Chinner Committed by Long Li
Browse files

xfs: convert xfs_sb_version_has checks to use mount features 

mainline inclusion
from mainline-v5.14-rc4
commit ebd9027d
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I4KIAO
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ebd9027d088b3a4e49d294f79e6cadb7b7a88b28



--------------------------------

This is a conversion of the remaining xfs_sb_version_has..(sbp)
checks to use xfs_has_..(mp) feature checks.

This was largely done with a vim replacement macro that did:

:0,$s/xfs_sb_version_has\(.*\)&\(.*\)->m_sb/xfs_has_\1\2/g<CR>

A couple of other variants were also used, and the rest touched up
by hand.

$ size -t fs/xfs/built-in.a
	   text    data     bss     dec     hex filename
before	1127533  311352     484 1439369  15f689 (TOTALS)
after	1125360  311352     484 1437196  15ee0c (TOTALS)

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>

 Conflicts:
	fs/xfs/libxfs/xfs_ialloc.c
	fs/xfs/libxfs/xfs_ialloc_btree.c
	fs/xfs/libxfs/xfs_inode_buf.c
	fs/xfs/xfs_mount.c
	fs/xfs/xfs_super.c

Signed-off-by: default avatarLong Li <leo.lilong@huawei.com>
parent 54fb04f6

fs/xfs/libxfs/xfs_ag.c

+2 −2
Original line number Diff line number Diff line
@@ -333,9 +333,9 @@ xfs_agiblock_init( 
	}

	for (bucket = 0; bucket < XFS_AGI_UNLINKED_BUCKETS; bucket++)

		agi->agi_unlinked[bucket] = cpu_to_be32(NULLAGINO);

	if (xfs_sb_version_hasinobtcounts(&mp->m_sb)) {

	if (xfs_has_inobtcounts(mp)) {

		agi->agi_iblocks = cpu_to_be32(1);

		if (xfs_sb_version_hasfinobt(&mp->m_sb))

		if (xfs_has_finobt(mp))

			agi->agi_fblocks = cpu_to_be32(1);

	}

}

fs/xfs/libxfs/xfs_alloc.c

+6 −6
Original line number Diff line number Diff line
@@ -2264,7 +2264,7 @@ xfs_alloc_min_freelist( 
	min_free += min_t(unsigned int, levels[XFS_BTNUM_CNTi] + 1,

				       mp->m_ag_maxlevels);

	/* space needed reverse mapping used space btree */

	if (xfs_sb_version_hasrmapbt(&mp->m_sb))

	if (xfs_has_rmapbt(mp))

		min_free += min_t(unsigned int, levels[XFS_BTNUM_RMAPi] + 1,

						mp->m_rmap_maxlevels);
@@ -2862,7 +2862,7 @@ xfs_agf_verify( 
	     be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]) > XFS_BTREE_MAXLEVELS))

		return __this_address;



	if (xfs_sb_version_hasrmapbt(&mp->m_sb) &&

	if (xfs_has_rmapbt(mp) &&

	    be32_to_cpu(agf->agf_rmap_blocks) > be32_to_cpu(agf->agf_length))

		return __this_address;
@@ -2875,16 +2875,16 @@ xfs_agf_verify( 
	if (bp->b_pag && be32_to_cpu(agf->agf_seqno) != bp->b_pag->pag_agno)

		return __this_address;



	if (xfs_sb_version_haslazysbcount(&mp->m_sb) &&

	if (xfs_has_lazysbcount(mp) &&

	    be32_to_cpu(agf->agf_btreeblks) > be32_to_cpu(agf->agf_length))

		return __this_address;



	if (xfs_sb_version_hasreflink(&mp->m_sb) &&

	if (xfs_has_reflink(mp) &&

	    be32_to_cpu(agf->agf_refcount_blocks) >

	    be32_to_cpu(agf->agf_length))

		return __this_address;



	if (xfs_sb_version_hasreflink(&mp->m_sb) &&

	if (xfs_has_reflink(mp) &&

	    (be32_to_cpu(agf->agf_refcount_level) < 1 ||

	     be32_to_cpu(agf->agf_refcount_level) > XFS_BTREE_MAXLEVELS))

		return __this_address;
@@ -3023,7 +3023,7 @@ xfs_alloc_read_agf( 
		 * counter only tracks non-root blocks.

		 */

		allocbt_blks = pag->pagf_btreeblks;

		if (xfs_sb_version_hasrmapbt(&mp->m_sb))

		if (xfs_has_rmapbt(mp))

			allocbt_blks -= be32_to_cpu(agf->agf_rmap_blocks) - 1;

		if (allocbt_blks > 0)

			atomic64_add(allocbt_blks, &mp->m_allocbt_blks);

fs/xfs/libxfs/xfs_alloc.h

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ static inline __be32 * 
xfs_buf_to_agfl_bno(

	struct xfs_buf		*bp)

{

	if (xfs_sb_version_hascrc(&bp->b_mount->m_sb))

	if (xfs_has_crc(bp->b_mount))

		return bp->b_addr + sizeof(struct xfs_agfl);

	return bp->b_addr;

}

fs/xfs/libxfs/xfs_alloc_btree.c

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ xfs_allocbt_verify( 
	if (!xfs_verify_magic(bp, block->bb_magic))

		return __this_address;



	if (xfs_sb_version_hascrc(&mp->m_sb)) {

	if (xfs_has_crc(mp)) {

		fa = xfs_btree_sblock_v5hdr_verify(bp);

		if (fa)

			return fa;

fs/xfs/libxfs/xfs_bmap_btree.c

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ xfs_bmbt_verify( 
	if (!xfs_verify_magic(bp, block->bb_magic))

		return __this_address;



	if (xfs_sb_version_hascrc(&mp->m_sb)) {

	if (xfs_has_crc(mp)) {

		/*

		 * XXX: need a better way of verifying the owner here. Right now

		 * just make sure there has been one set.