Commit c23c393e authored by Pavel Reichl's avatar Pavel Reichl Committed by Darrick J. Wong
Browse files

xfs: remove deprecated mount options 



ikeep/noikeep was a workaround for old DMAPI code which is no longer
relevant.

attr2/noattr2 - is for controlling upgrade behaviour from fixed attribute
fork sizes in the inode (attr1) and dynamic attribute fork sizes (attr2).
mkfs has defaulted to setting attr2 since 2007, hence just about every
XFS filesystem out there in production right now uses attr2.

Signed-off-by: default avatarPavel Reichl <preichl@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
[darrick: fix minor typos]
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent c9c626b3

Documentation/admin-guide/xfs.rst

+2 −0
Original line number Diff line number Diff line
@@ -240,6 +240,8 @@ Deprecated Mount Options 
  Name				Removal Schedule

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

Mounting with V4 filesystem     September 2030

ikeep/noikeep			September 2025

attr2/noattr2			September 2025

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

fs/xfs/xfs_super.c

+18 −13
Original line number Diff line number Diff line
@@ -1234,25 +1234,12 @@ xfs_fc_parse_param( 
	case Opt_nouuid:

		mp->m_flags |= XFS_MOUNT_NOUUID;

		return 0;

	case Opt_ikeep:

		mp->m_flags |= XFS_MOUNT_IKEEP;

		return 0;

	case Opt_noikeep:

		mp->m_flags &= ~XFS_MOUNT_IKEEP;

		return 0;

	case Opt_largeio:

		mp->m_flags |= XFS_MOUNT_LARGEIO;

		return 0;

	case Opt_nolargeio:

		mp->m_flags &= ~XFS_MOUNT_LARGEIO;

		return 0;

	case Opt_attr2:

		mp->m_flags |= XFS_MOUNT_ATTR2;

		return 0;

	case Opt_noattr2:

		mp->m_flags &= ~XFS_MOUNT_ATTR2;

		mp->m_flags |= XFS_MOUNT_NOATTR2;

		return 0;

	case Opt_filestreams:

		mp->m_flags |= XFS_MOUNT_FILESTREAMS;

		return 0;
@@ -1304,6 +1291,24 @@ xfs_fc_parse_param( 
		xfs_mount_set_dax_mode(mp, result.uint_32);

		return 0;

#endif

	/* Following mount options will be removed in September 2025 */

	case Opt_ikeep:

		xfs_warn(mp, "%s mount option is deprecated.", param->key);

		mp->m_flags |= XFS_MOUNT_IKEEP;

		return 0;

	case Opt_noikeep:

		xfs_warn(mp, "%s mount option is deprecated.", param->key);

		mp->m_flags &= ~XFS_MOUNT_IKEEP;

		return 0;

	case Opt_attr2:

		xfs_warn(mp, "%s mount option is deprecated.", param->key);

		mp->m_flags |= XFS_MOUNT_ATTR2;

		return 0;

	case Opt_noattr2:

		xfs_warn(mp, "%s mount option is deprecated.", param->key);

		mp->m_flags &= ~XFS_MOUNT_ATTR2;

		mp->m_flags |= XFS_MOUNT_NOATTR2;

		return 0;

	default:

		xfs_warn(mp, "unknown mount option [%s].", param->key);

		return -EINVAL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE