Commit 0560f31a authored by Dave Chinner's avatar Dave Chinner Committed by Darrick J. Wong
Browse files

xfs: convert mount flags to features 



Replace m_flags feature checks with xfs_has_<feature>() calls and
rework the setup code to set flags in m_features.

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>
parent 8970a5b8

fs/xfs/libxfs/xfs_attr.c

+2 −2
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ xfs_attr_try_sf_addname( 
	if (!error && !(args->op_flags & XFS_DA_OP_NOTIME))

		xfs_trans_ichgtime(args->trans, dp, XFS_ICHGTIME_CHG);



	if (dp->i_mount->m_flags & XFS_MOUNT_WSYNC)

	if (xfs_has_wsync(dp->i_mount))

		xfs_trans_set_sync(args->trans);



	return error;
@@ -808,7 +808,7 @@ xfs_attr_set( 
	 * If this is a synchronous mount, make sure that the

	 * transaction goes to disk before returning to the user.

	 */

	if (mp->m_flags & XFS_MOUNT_WSYNC)

	if (xfs_has_wsync(mp))

		xfs_trans_set_sync(args->trans);



	if (!(args->op_flags & XFS_DA_OP_NOTIME))

fs/xfs/libxfs/xfs_attr_leaf.c

+23 −18
Original line number Diff line number Diff line
@@ -568,7 +568,7 @@ xfs_attr_shortform_bytesfit( 
	 * literal area, but for the old format we are done if there is no

	 * space in the fixed attribute fork.

	 */

	if (!(mp->m_flags & XFS_MOUNT_ATTR2))

	if (!xfs_has_attr2(mp))

		return 0;



	dsize = dp->i_df.if_bytes;
@@ -621,21 +621,27 @@ xfs_attr_shortform_bytesfit( 
}



/*

 * Switch on the ATTR2 superblock bit (implies also FEATURES2)

 * Switch on the ATTR2 superblock bit (implies also FEATURES2) unless:

 * - noattr2 mount option is set,

 * - on-disk version bit says it is already set, or

 * - the attr2 mount option is not set to enable automatic upgrade from attr1.

 */

STATIC void

xfs_sbversion_add_attr2(xfs_mount_t *mp, xfs_trans_t *tp)

xfs_sbversion_add_attr2(

	struct xfs_mount	*mp,

	struct xfs_trans	*tp)

{

	if ((mp->m_flags & XFS_MOUNT_ATTR2) &&

	    !(xfs_has_attr2(mp))) {

	if (xfs_has_noattr2(mp))

		return;

	if (mp->m_sb.sb_features2 & XFS_SB_VERSION2_ATTR2BIT)

		return;

	if (!xfs_has_attr2(mp))

		return;



	spin_lock(&mp->m_sb_lock);

		if (!xfs_has_attr2(mp)) {

	xfs_add_attr2(mp);

	spin_unlock(&mp->m_sb_lock);

	xfs_log_sb(tp);

		} else

			spin_unlock(&mp->m_sb_lock);

	}

}



/*
@@ -810,8 +816,7 @@ xfs_attr_sf_removename( 
	 * Fix up the start offset of the attribute fork

	 */

	totsize -= size;

	if (totsize == sizeof(xfs_attr_sf_hdr_t) &&

	    (mp->m_flags & XFS_MOUNT_ATTR2) &&

	if (totsize == sizeof(xfs_attr_sf_hdr_t) && xfs_has_attr2(mp) &&

	    (dp->i_df.if_format != XFS_DINODE_FMT_BTREE) &&

	    !(args->op_flags & XFS_DA_OP_ADDNAME)) {

		xfs_attr_fork_remove(dp, args->trans);
@@ -821,7 +826,7 @@ xfs_attr_sf_removename( 
		ASSERT(dp->i_forkoff);

		ASSERT(totsize > sizeof(xfs_attr_sf_hdr_t) ||

				(args->op_flags & XFS_DA_OP_ADDNAME) ||

				!(mp->m_flags & XFS_MOUNT_ATTR2) ||

				!xfs_has_attr2(mp) ||

				dp->i_df.if_format == XFS_DINODE_FMT_BTREE);

		xfs_trans_log_inode(args->trans, dp,

					XFS_ILOG_CORE | XFS_ILOG_ADATA);
@@ -997,7 +1002,7 @@ xfs_attr_shortform_allfit( 
		bytes += xfs_attr_sf_entsize_byname(name_loc->namelen,

					be16_to_cpu(name_loc->valuelen));

	}

	if ((dp->i_mount->m_flags & XFS_MOUNT_ATTR2) &&

	if (xfs_has_attr2(dp->i_mount) &&

	    (dp->i_df.if_format != XFS_DINODE_FMT_BTREE) &&

	    (bytes == sizeof(struct xfs_attr_sf_hdr)))

		return -1;
@@ -1122,7 +1127,7 @@ xfs_attr3_leaf_to_shortform( 
		goto out;



	if (forkoff == -1) {

		ASSERT(dp->i_mount->m_flags & XFS_MOUNT_ATTR2);

		ASSERT(xfs_has_attr2(dp->i_mount));

		ASSERT(dp->i_df.if_format != XFS_DINODE_FMT_BTREE);

		xfs_attr_fork_remove(dp, args->trans);

		goto out;

fs/xfs/libxfs/xfs_bmap.c

+2 −2
Original line number Diff line number Diff line
@@ -1047,7 +1047,7 @@ xfs_bmap_set_attrforkoff( 
		ip->i_forkoff = xfs_attr_shortform_bytesfit(ip, size);

		if (!ip->i_forkoff)

			ip->i_forkoff = default_size;

		else if ((ip->i_mount->m_flags & XFS_MOUNT_ATTR2) && version)

		else if (xfs_has_attr2(ip->i_mount) && version)

			*version = 2;

		break;

	default:
@@ -3422,7 +3422,7 @@ xfs_bmap_compute_alignments( 
	int			stripe_align = 0;



	/* stripe alignment for allocation is determined by mount parameters */

	if (mp->m_swidth && (mp->m_flags & XFS_MOUNT_SWALLOC))

	if (mp->m_swidth && xfs_has_swalloc(mp))

		stripe_align = mp->m_swidth;

	else if (mp->m_dalign)

		stripe_align = mp->m_dalign;

fs/xfs/libxfs/xfs_ialloc.c

+4 −6
Original line number Diff line number Diff line
@@ -712,7 +712,7 @@ xfs_ialloc_ag_alloc( 
		 */

		isaligned = 0;

		if (igeo->ialloc_align) {

			ASSERT(!(args.mp->m_flags & XFS_MOUNT_NOALIGN));

			ASSERT(!xfs_has_noalign(args.mp));

			args.alignment = args.mp->m_dalign;

			isaligned = 1;

		} else
@@ -1953,8 +1953,7 @@ xfs_difree_inobt( 
	 * remove the chunk if the block size is large enough for multiple inode

	 * chunks (that might not be free).

	 */

	if (!(mp->m_flags & XFS_MOUNT_IKEEP) &&

	    rec.ir_free == XFS_INOBT_ALL_FREE &&

	if (!xfs_has_ikeep(mp) && rec.ir_free == XFS_INOBT_ALL_FREE &&

	    mp->m_sb.sb_inopblock <= XFS_INODES_PER_CHUNK) {

		struct xfs_perag	*pag = agbp->b_pag;
@@ -2098,9 +2097,8 @@ xfs_difree_finobt( 
	 * enough for multiple chunks. Leave the finobt record to remain in sync

	 * with the inobt.

	 */

	if (rec.ir_free == XFS_INOBT_ALL_FREE &&

	    mp->m_sb.sb_inopblock <= XFS_INODES_PER_CHUNK &&

	    !(mp->m_flags & XFS_MOUNT_IKEEP)) {

	if (!xfs_has_ikeep(mp) && rec.ir_free == XFS_INOBT_ALL_FREE &&

	    mp->m_sb.sb_inopblock <= XFS_INODES_PER_CHUNK) {

		error = xfs_btree_delete(cur, &i);

		if (error)

			goto error;

fs/xfs/scrub/scrub.c

+1 −1
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ xfs_scrub_metadata( 
	if (XFS_FORCED_SHUTDOWN(mp))

		goto out;

	error = -ENOTRECOVERABLE;

	if (mp->m_flags & XFS_MOUNT_NORECOVERY)

	if (xfs_has_norecovery(mp))

		goto out;



	error = xchk_validate_inputs(mp, sm);