Unverified Commit 2c2b88e1 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!929 xfs: rework feature flags 

Merge Pull Request from: @ci-robot 
 
PR sync from:  Long Li <leo.lilong@huawei.com>
 https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/thread/VMTODLDVORICUCP4QJE2ED6RJVAJXSFY/ 
Darrick J. Wong (1):
  xfs: fix incorrect error-out in xfs_remove

Dave Chinner (17):
  xfs: log items should have a xlog pointer, not a mount
  xfs: xfs_is_shutdown vs xlog_is_shutdown cage fight
  xfs: rename xfs_has_attr()
  xfs: rework attr2 feature and mount options
  xfs: reflect sb features in xfs_mount
  xfs: replace xfs_sb_version checks with feature flag checks
  xfs: consolidate mount option features in m_features
  xfs: convert mount flags to features
  xfs: convert remaining mount flags to state flags
  xfs: replace XFS_FORCED_SHUTDOWN with xfs_is_shutdown
  xfs: convert xfs_fs_geometry to use mount feature checks
  xfs: open code sb verifier feature checks
  xfs: convert scrub to use mount-based feature checks
  xfs: convert xfs_sb_version_has checks to use mount features
  xfs: remove unused xfs_sb_version_has wrappers
  xfs: introduce xfs_sb_is_v5 helper
  xfs: kill xfs_sb_version_has_v3inode()


-- 
2.31.1
 
 
Link:https://gitee.com/openeuler/kernel/pulls/929

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents db8ef813 59cd49d5

fs/xfs/libxfs/xfs_ag.c

+12 −12
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ xfs_rmaproot_init( 
	rrec->rm_offset = 0;



	/* account for refc btree root */

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

	if (xfs_has_reflink(mp)) {

		rrec = XFS_RMAP_REC_ADDR(block, 5);

		rrec->rm_startblock = cpu_to_be32(xfs_refc_block(mp));

		rrec->rm_blockcount = cpu_to_be32(1);
@@ -254,7 +254,7 @@ xfs_agfblock_init( 
	agf->agf_roots[XFS_BTNUM_CNTi] = cpu_to_be32(XFS_CNT_BLOCK(mp));

	agf->agf_levels[XFS_BTNUM_BNOi] = cpu_to_be32(1);

	agf->agf_levels[XFS_BTNUM_CNTi] = cpu_to_be32(1);

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

	if (xfs_has_rmapbt(mp)) {

		agf->agf_roots[XFS_BTNUM_RMAPi] =

					cpu_to_be32(XFS_RMAP_BLOCK(mp));

		agf->agf_levels[XFS_BTNUM_RMAPi] = cpu_to_be32(1);
@@ -267,9 +267,9 @@ xfs_agfblock_init( 
	tmpsize = id->agsize - mp->m_ag_prealloc_blocks;

	agf->agf_freeblks = cpu_to_be32(tmpsize);

	agf->agf_longest = cpu_to_be32(tmpsize);

	if (xfs_sb_version_hascrc(&mp->m_sb))

	if (xfs_has_crc(mp))

		uuid_copy(&agf->agf_uuid, &mp->m_sb.sb_meta_uuid);

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

	if (xfs_has_reflink(mp)) {

		agf->agf_refcount_root = cpu_to_be32(

				xfs_refc_block(mp));

		agf->agf_refcount_level = cpu_to_be32(1);
@@ -295,7 +295,7 @@ xfs_agflblock_init( 
	__be32			*agfl_bno;

	int			bucket;



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

	if (xfs_has_crc(mp)) {

		agfl->agfl_magicnum = cpu_to_be32(XFS_AGFL_MAGIC);

		agfl->agfl_seqno = cpu_to_be32(id->agno);

		uuid_copy(&agfl->agfl_uuid, &mp->m_sb.sb_meta_uuid);
@@ -325,17 +325,17 @@ xfs_agiblock_init( 
	agi->agi_freecount = 0;

	agi->agi_newino = cpu_to_be32(NULLAGINO);

	agi->agi_dirino = cpu_to_be32(NULLAGINO);

	if (xfs_sb_version_hascrc(&mp->m_sb))

	if (xfs_has_crc(mp))

		uuid_copy(&agi->agi_uuid, &mp->m_sb.sb_meta_uuid);

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

	if (xfs_has_finobt(mp)) {

		agi->agi_free_root = cpu_to_be32(XFS_FIBT_BLOCK(mp));

		agi->agi_free_level = cpu_to_be32(1);

	}

	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);

	}

}
@@ -445,14 +445,14 @@ xfs_ag_init_headers( 
		.ops = &xfs_finobt_buf_ops,

		.work = &xfs_btroot_init,

		.type = XFS_BTNUM_FINO,

		.need_init =  xfs_sb_version_hasfinobt(&mp->m_sb)

		.need_init =  xfs_has_finobt(mp)

	},

	{ /* RMAP root block */

		.daddr = XFS_AGB_TO_DADDR(mp, id->agno, XFS_RMAP_BLOCK(mp)),

		.numblks = BTOBB(mp->m_sb.sb_blocksize),

		.ops = &xfs_rmapbt_buf_ops,

		.work = &xfs_rmaproot_init,

		.need_init = xfs_sb_version_hasrmapbt(&mp->m_sb)

		.need_init = xfs_has_rmapbt(mp)

	},

	{ /* REFC root block */

		.daddr = XFS_AGB_TO_DADDR(mp, id->agno, xfs_refc_block(mp)),
@@ -460,7 +460,7 @@ xfs_ag_init_headers( 
		.ops = &xfs_refcountbt_buf_ops,

		.work = &xfs_btroot_init,

		.type = XFS_BTNUM_REFC,

		.need_init = xfs_sb_version_hasreflink(&mp->m_sb)

		.need_init = xfs_has_reflink(mp)

	},

	{ /* NULL terminating block */

		.daddr = XFS_BUF_DADDR_NULL,

fs/xfs/libxfs/xfs_alloc.c

+25 −25
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ xfs_agfl_size( 
{

	unsigned int		size = mp->m_sb.sb_sectsize;



	if (xfs_sb_version_hascrc(&mp->m_sb))

	if (xfs_has_crc(mp))

		size -= sizeof(struct xfs_agfl);



	return size / sizeof(xfs_agblock_t);
@@ -61,9 +61,9 @@ unsigned int 
xfs_refc_block(

	struct xfs_mount	*mp)

{

	if (xfs_sb_version_hasrmapbt(&mp->m_sb))

	if (xfs_has_rmapbt(mp))

		return XFS_RMAP_BLOCK(mp) + 1;

	if (xfs_sb_version_hasfinobt(&mp->m_sb))

	if (xfs_has_finobt(mp))

		return XFS_FIBT_BLOCK(mp) + 1;

	return XFS_IBT_BLOCK(mp) + 1;

}
@@ -72,11 +72,11 @@ xfs_extlen_t 
xfs_prealloc_blocks(

	struct xfs_mount	*mp)

{

	if (xfs_sb_version_hasreflink(&mp->m_sb))

	if (xfs_has_reflink(mp))

		return xfs_refc_block(mp) + 1;

	if (xfs_sb_version_hasrmapbt(&mp->m_sb))

	if (xfs_has_rmapbt(mp))

		return XFS_RMAP_BLOCK(mp) + 1;

	if (xfs_sb_version_hasfinobt(&mp->m_sb))

	if (xfs_has_finobt(mp))

		return XFS_FIBT_BLOCK(mp) + 1;

	return XFS_IBT_BLOCK(mp) + 1;

}
@@ -126,11 +126,11 @@ xfs_alloc_ag_max_usable( 
	blocks = XFS_BB_TO_FSB(mp, XFS_FSS_TO_BB(mp, 4)); /* ag headers */

	blocks += XFS_ALLOC_AGFL_RESERVE;

	blocks += 3;			/* AGF, AGI btree root blocks */

	if (xfs_sb_version_hasfinobt(&mp->m_sb))

	if (xfs_has_finobt(mp))

		blocks++;		/* finobt root block */

	if (xfs_sb_version_hasrmapbt(&mp->m_sb))

	if (xfs_has_rmapbt(mp))

		blocks++; 		/* rmap root block */

	if (xfs_sb_version_hasreflink(&mp->m_sb))

	if (xfs_has_reflink(mp))

		blocks++;		/* refcount root block */



	return mp->m_sb.sb_agblocks - blocks;
@@ -598,7 +598,7 @@ xfs_agfl_verify( 
	 * AGFL is what the AGF says is active. We can't get to the AGF, so we

	 * can't verify just those entries are valid.

	 */

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

	if (!xfs_has_crc(mp))

		return NULL;



	if (!xfs_verify_magic(bp, agfl->agfl_magicnum))
@@ -638,7 +638,7 @@ xfs_agfl_read_verify( 
	 * AGFL is what the AGF says is active. We can't get to the AGF, so we

	 * can't verify just those entries are valid.

	 */

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

	if (!xfs_has_crc(mp))

		return;



	if (!xfs_buf_verify_cksum(bp, XFS_AGFL_CRC_OFF))
@@ -659,7 +659,7 @@ xfs_agfl_write_verify( 
	xfs_failaddr_t		fa;



	/* no verification of non-crc AGFLs */

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

	if (!xfs_has_crc(mp))

		return;



	fa = xfs_agfl_verify(bp);
@@ -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);
@@ -2373,7 +2373,7 @@ xfs_agfl_needs_reset( 
	int			active;



	/* no agfl header on v4 supers */

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

	if (!xfs_has_crc(mp))

		return false;



	/*
@@ -2827,7 +2827,7 @@ xfs_agf_verify( 
	struct xfs_mount	*mp = bp->b_mount;

	struct xfs_agf		*agf = bp->b_addr;



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

	if (xfs_has_crc(mp)) {

		if (!uuid_equal(&agf->agf_uuid, &mp->m_sb.sb_meta_uuid))

			return __this_address;

		if (!xfs_log_check_lsn(mp, be64_to_cpu(agf->agf_lsn)))
@@ -2857,12 +2857,12 @@ xfs_agf_verify( 
	    be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]) > XFS_BTREE_MAXLEVELS)

		return __this_address;



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

	if (xfs_has_rmapbt(mp) &&

	    (be32_to_cpu(agf->agf_levels[XFS_BTNUM_RMAP]) < 1 ||

	     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;
@@ -2900,7 +2900,7 @@ xfs_agf_read_verify( 
	struct xfs_mount *mp = bp->b_mount;

	xfs_failaddr_t	fa;



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

	if (xfs_has_crc(mp) &&

	    !xfs_buf_verify_cksum(bp, XFS_AGF_CRC_OFF))

		xfs_verifier_error(bp, -EFSBADCRC, __this_address);

	else {
@@ -2925,7 +2925,7 @@ xfs_agf_write_verify( 
		return;

	}



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

	if (!xfs_has_crc(mp))

		return;



	if (bip)
@@ -3023,13 +3023,13 @@ 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);

	}

#ifdef DEBUG

	else if (!XFS_FORCED_SHUTDOWN(mp)) {

	else if (!xfs_is_shutdown(mp)) {

		ASSERT(pag->pagf_freeblks == be32_to_cpu(agf->agf_freeblks));

		ASSERT(pag->pagf_btreeblks == be32_to_cpu(agf->agf_btreeblks));

		ASSERT(pag->pagf_flcount == be32_to_cpu(agf->agf_flcount));
@@ -3116,7 +3116,7 @@ xfs_alloc_vextent( 
		 * the first a.g. fails.

		 */

		if ((args->datatype & XFS_ALLOC_INITIAL_USER_DATA) &&

		    (mp->m_flags & XFS_MOUNT_32BITINODES)) {

		    xfs_is_inode32(mp)) {

			args->fsbno = XFS_AGB_TO_FSB(mp,

					((mp->m_agfrotor / rotorstep) %

					mp->m_sb.sb_agcount), 0);

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

+2 −2
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;
@@ -499,7 +499,7 @@ xfs_allocbt_init_common( 
	cur->bc_ag.agno = agno;

	cur->bc_ag.abt.active = false;



	if (xfs_sb_version_hascrc(&mp->m_sb))

	if (xfs_has_crc(mp))

		cur->bc_flags |= XFS_BTREE_CRC_BLOCKS;



	return cur;

fs/xfs/libxfs/xfs_alloc_btree.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ struct xbtree_afakeroot; 
 * Btree block header size depends on a superblock flag.

 */

#define XFS_ALLOC_BLOCK_LEN(mp) \

	(xfs_sb_version_hascrc(&((mp)->m_sb)) ? \

	(xfs_has_crc(((mp))) ? \

		XFS_BTREE_SBLOCK_CRC_LEN : XFS_BTREE_SBLOCK_LEN)



/*