Commit b9a176e5 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: remove deprecated mount options 



These four mount options were scheduled for removal in September 2025,
so remove them now.

Cc: preichl@redhat.com
Signed-off-by: default avatar"Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: default avatarCarlos Maiolino <cmaiolino@redhat.com>
parent f6926051

Documentation/admin-guide/xfs.rst

+2 −24
Original line number Diff line number Diff line
@@ -34,22 +34,6 @@ When mounting an XFS filesystem, the following options are accepted. 
	to the file. Specifying a fixed ``allocsize`` value turns off

	the dynamic behaviour.



  attr2 or noattr2

	The options enable/disable an "opportunistic" improvement to

	be made in the way inline extended attributes are stored

	on-disk.  When the new form is used for the first time when

	``attr2`` is selected (either when setting or removing extended

	attributes) the on-disk superblock feature bit field will be

	updated to reflect this format being in use.



	The default behaviour is determined by the on-disk feature

	bit indicating that ``attr2`` behaviour is active. If either

	mount option is set, then that becomes the new default used

	by the filesystem.



	CRC enabled filesystems always use the ``attr2`` format, and so

	will reject the ``noattr2`` mount option if it is set.



  discard or nodiscard (default)

	Enable/disable the issuing of commands to let the block

	device reclaim space freed by the filesystem.  This is
@@ -75,12 +59,6 @@ When mounting an XFS filesystem, the following options are accepted. 
	across the entire filesystem rather than just on directories

	configured to use it.



  ikeep or noikeep (default)

	When ``ikeep`` is specified, XFS does not delete empty inode

	clusters and keeps them around on disk.  When ``noikeep`` is

	specified, empty inode clusters are returned to the free

	space pool.



  inode32 or inode64 (default)

	When ``inode32`` is specified, it indicates that XFS limits

	inode creation to locations which will not result in inode
@@ -267,8 +245,6 @@ Deprecated Mount Options 
============================    ================

Mounting with V4 filesystem     September 2030

Mounting ascii-ci filesystem    September 2030

ikeep/noikeep			September 2025

attr2/noattr2			September 2025

============================    ================
@@ -284,6 +260,8 @@ Removed Mount Options 
  osyncisdsync/osyncisosync	v4.0

  barrier			v4.19

  nobarrier			v4.19

  ikeep/noikeep			v6.18

  attr2/noattr2			v6.18

===========================     =======



sysctls

fs/xfs/libxfs/xfs_attr_leaf.c

+5 −18
Original line number Diff line number Diff line
@@ -667,12 +667,8 @@ xfs_attr_shortform_bytesfit( 


	/*

	 * For attr2 we can try to move the forkoff if there is space in the

	 * literal area, but for the old format we are done if there is no

	 * space in the fixed attribute fork.

	 * literal area

	 */

	if (!xfs_has_attr2(mp))

		return 0;



	dsize = dp->i_df.if_bytes;



	switch (dp->i_df.if_format) {
@@ -723,22 +719,16 @@ xfs_attr_shortform_bytesfit( 
}



/*

 * 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.

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

 * on-disk version bit says it is already set

 */

STATIC void

xfs_sbversion_add_attr2(

	struct xfs_mount	*mp,

	struct xfs_trans	*tp)

{

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

	xfs_add_attr2(mp);
@@ -889,7 +879,7 @@ xfs_attr_sf_removename( 
	/*

	 * Fix up the start offset of the attribute fork

	 */

	if (totsize == sizeof(struct xfs_attr_sf_hdr) && xfs_has_attr2(mp) &&

	if (totsize == sizeof(struct xfs_attr_sf_hdr) &&

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

	    !(args->op_flags & (XFS_DA_OP_ADDNAME | XFS_DA_OP_REPLACE)) &&

	    !xfs_has_parent(mp)) {
@@ -900,7 +890,6 @@ xfs_attr_sf_removename( 
		ASSERT(dp->i_forkoff);

		ASSERT(totsize > sizeof(struct xfs_attr_sf_hdr) ||

				(args->op_flags & XFS_DA_OP_ADDNAME) ||

				!xfs_has_attr2(mp) ||

				dp->i_df.if_format == XFS_DINODE_FMT_BTREE ||

				xfs_has_parent(mp));

		xfs_trans_log_inode(args->trans, dp,
@@ -1040,8 +1029,7 @@ xfs_attr_shortform_allfit( 
		bytes += xfs_attr_sf_entsize_byname(name_loc->namelen,

					be16_to_cpu(name_loc->valuelen));

	}

	if (xfs_has_attr2(dp->i_mount) &&

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

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

	    (bytes == sizeof(struct xfs_attr_sf_hdr)))

		return -1;

	return xfs_attr_shortform_bytesfit(dp, bytes);
@@ -1161,7 +1149,6 @@ xfs_attr3_leaf_to_shortform( 
		 * this case.

		 */

		if (!(args->op_flags & XFS_DA_OP_REPLACE)) {

			ASSERT(xfs_has_attr2(dp->i_mount));

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

			xfs_attr_fork_remove(dp, args->trans);

		}

fs/xfs/libxfs/xfs_bmap.c

+3 −11
Original line number Diff line number Diff line
@@ -997,8 +997,7 @@ xfs_bmap_add_attrfork_local( 
static int

xfs_bmap_set_attrforkoff(

	struct xfs_inode	*ip,

	int			size,

	int			*version)

	int			size)

{

	int			default_size = xfs_default_attroffset(ip) >> 3;
@@ -1012,8 +1011,6 @@ xfs_bmap_set_attrforkoff( 
		ip->i_forkoff = xfs_attr_shortform_bytesfit(ip, size);

		if (!ip->i_forkoff)

			ip->i_forkoff = default_size;

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

			*version = 2;

		break;

	default:

		ASSERT(0);
@@ -1035,7 +1032,6 @@ xfs_bmap_add_attrfork( 
	int			rsvd)		/* xact may use reserved blks */

{

	struct xfs_mount	*mp = tp->t_mountp;

	int			version = 1;	/* superblock attr version */

	int			logflags;	/* logging flags */

	int			error;		/* error return value */
@@ -1045,7 +1041,7 @@ xfs_bmap_add_attrfork( 
	ASSERT(!xfs_inode_has_attr_fork(ip));



	xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);

	error = xfs_bmap_set_attrforkoff(ip, size, &version);

	error = xfs_bmap_set_attrforkoff(ip, size);

	if (error)

		return error;
@@ -1069,16 +1065,12 @@ xfs_bmap_add_attrfork( 
		xfs_trans_log_inode(tp, ip, logflags);

	if (error)

		return error;

	if (!xfs_has_attr(mp) ||

	   (!xfs_has_attr2(mp) && version == 2)) {

	if (!xfs_has_attr(mp)) {

		bool log_sb = false;



		spin_lock(&mp->m_sb_lock);

		if (!xfs_has_attr(mp)) {

			xfs_add_attr(mp);

			log_sb = true;

		}

		if (!xfs_has_attr2(mp) && version == 2) {

			xfs_add_attr2(mp);

			log_sb = true;

		}

fs/xfs/libxfs/xfs_ialloc.c

+2 −2
Original line number Diff line number Diff line
@@ -2140,7 +2140,7 @@ xfs_difree_inobt( 
	 * remove the chunk if the block size is large enough for multiple inode

	 * chunks (that might not be free).

	 */

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

	if (rec.ir_free == XFS_INOBT_ALL_FREE &&

	    mp->m_sb.sb_inopblock <= XFS_INODES_PER_CHUNK) {

		xic->deleted = true;

		xic->first_ino = xfs_agino_to_ino(pag, rec.ir_startino);
@@ -2286,7 +2286,7 @@ xfs_difree_finobt( 
	 * enough for multiple chunks. Leave the finobt record to remain in sync

	 * with the inobt.

	 */

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

	if (rec.ir_free == XFS_INOBT_ALL_FREE &&

	    mp->m_sb.sb_inopblock <= XFS_INODES_PER_CHUNK) {

		error = xfs_btree_delete(cur, &i);

		if (error)

fs/xfs/libxfs/xfs_sb.c

+3 −6
Original line number Diff line number Diff line
@@ -142,8 +142,6 @@ xfs_sb_version_to_features( 
	if (sbp->sb_versionnum & XFS_SB_VERSION_MOREBITSBIT) {

		if (sbp->sb_features2 & XFS_SB_VERSION2_LAZYSBCOUNTBIT)

			features |= XFS_FEAT_LAZYSBCOUNT;

		if (sbp->sb_features2 & XFS_SB_VERSION2_ATTR2BIT)

			features |= XFS_FEAT_ATTR2;

		if (sbp->sb_features2 & XFS_SB_VERSION2_PROJID32BIT)

			features |= XFS_FEAT_PROJID32;

		if (sbp->sb_features2 & XFS_SB_VERSION2_FTYPE)
@@ -155,7 +153,7 @@ xfs_sb_version_to_features( 


	/* Always on V5 features */

	features |= XFS_FEAT_ALIGN | XFS_FEAT_LOGV2 | XFS_FEAT_EXTFLG |

		    XFS_FEAT_LAZYSBCOUNT | XFS_FEAT_ATTR2 | XFS_FEAT_PROJID32 |

		    XFS_FEAT_LAZYSBCOUNT | XFS_FEAT_PROJID32 |

		    XFS_FEAT_V3INODES | XFS_FEAT_CRC | XFS_FEAT_PQUOTINO;



	/* Optional V5 features */
@@ -1524,7 +1522,8 @@ xfs_fs_geometry( 
	geo->version = XFS_FSOP_GEOM_VERSION;

	geo->flags = XFS_FSOP_GEOM_FLAGS_NLINK |

		     XFS_FSOP_GEOM_FLAGS_DIRV2 |

		     XFS_FSOP_GEOM_FLAGS_EXTFLG;

		     XFS_FSOP_GEOM_FLAGS_EXTFLG |

		     XFS_FSOP_GEOM_FLAGS_ATTR2;

	if (xfs_has_attr(mp))

		geo->flags |= XFS_FSOP_GEOM_FLAGS_ATTR;

	if (xfs_has_quota(mp))
@@ -1537,8 +1536,6 @@ xfs_fs_geometry( 
		geo->flags |= XFS_FSOP_GEOM_FLAGS_DIRV2CI;

	if (xfs_has_lazysbcount(mp))

		geo->flags |= XFS_FSOP_GEOM_FLAGS_LAZYSB;

	if (xfs_has_attr2(mp))

		geo->flags |= XFS_FSOP_GEOM_FLAGS_ATTR2;

	if (xfs_has_projid32(mp))

		geo->flags |= XFS_FSOP_GEOM_FLAGS_PROJID32;

	if (xfs_has_crc(mp))