On Fri, Sep 05, 2025 at 10:35:00AM +0200, Carlos Maiolino wrote:
> On Wed, Sep 03, 2025 at 08:00:08AM -0700, Darrick J. Wong wrote:
> > From: Darrick J. Wong <djwong@xxxxxxxxxx>
> >
> > These four mount options were scheduled for removal in September 2025,
> > so remove them now.
> >
> > Cc: preichl@xxxxxxxxxx
> > Signed-off-by: "Darrick J. Wong" <djwong@xxxxxxxxxx>
> > ---
> > fs/xfs/xfs_mount.h | 12 ++++---
> > Documentation/admin-guide/xfs.rst | 26 +---------------
> > fs/xfs/libxfs/xfs_attr_leaf.c | 23 +++-----------
> > fs/xfs/libxfs/xfs_bmap.c | 14 ++-------
> > fs/xfs/libxfs/xfs_ialloc.c | 4 +-
> > fs/xfs/libxfs/xfs_sb.c | 9 ++----
> > fs/xfs/xfs_icache.c | 6 +---
> > fs/xfs/xfs_mount.c | 13 --------
> > fs/xfs/xfs_super.c | 60 +------------------------------------
> > 9 files changed, 25 insertions(+), 142 deletions(-)
> >
> >
<snip>
> Looks good.
>
> I'm sure you already have it planned, but just being paranoid... Will
> you consider updating xfsprogs too? :)
Yes, I'll send that for xfsprogs 6.18. I think that's all just manpage
updates + libxfs sync.
--D
> Reviewed-by: Carlos Maiolino <cmaiolino@xxxxxxxxxx>
>
> > - /*
> > - * V5 filesystems always use attr2 format for attributes.
> > - */
> > - if (xfs_has_crc(mp) && xfs_has_noattr2(mp)) {
> > - xfs_warn(mp, "Cannot mount a V5 filesystem as noattr2. "
> > - "attr2 is always enabled for V5 filesystems.");
> > - return -EINVAL;
> > - }
> > -
> > /*
> > * prohibit r/w mounts of read-only filesystems
> > */
> > @@ -1542,22 +1527,6 @@ xfs_fs_parse_param(
> > return 0;
> > #endif
> > /* Following mount options will be removed in September 2025 */
> > - case Opt_ikeep:
> > - xfs_fs_warn_deprecated(fc, param, XFS_FEAT_IKEEP, true);
> > - parsing_mp->m_features |= XFS_FEAT_IKEEP;
> > - return 0;
> > - case Opt_noikeep:
> > - xfs_fs_warn_deprecated(fc, param, XFS_FEAT_IKEEP, false);
> > - parsing_mp->m_features &= ~XFS_FEAT_IKEEP;
> > - return 0;
> > - case Opt_attr2:
> > - xfs_fs_warn_deprecated(fc, param, XFS_FEAT_ATTR2, true);
> > - parsing_mp->m_features |= XFS_FEAT_ATTR2;
> > - return 0;
> > - case Opt_noattr2:
> > - xfs_fs_warn_deprecated(fc, param, XFS_FEAT_NOATTR2, true);
> > - parsing_mp->m_features |= XFS_FEAT_NOATTR2;
> > - return 0;
> > case Opt_max_open_zones:
> > parsing_mp->m_max_open_zones = result.uint_32;
> > return 0;
> > @@ -1593,16 +1562,6 @@ xfs_fs_validate_params(
> > return -EINVAL;
> > }
> >
> > - /*
> > - * We have not read the superblock at this point, so only the attr2
> > - * mount option can set the attr2 feature by this stage.
> > - */
> > - if (xfs_has_attr2(mp) && xfs_has_noattr2(mp)) {
> > - xfs_warn(mp, "attr2 and noattr2 cannot both be specified.");
> > - return -EINVAL;
> > - }
> > -
> > -
> > if (xfs_has_noalign(mp) && (mp->m_dalign || mp->m_swidth)) {
> > xfs_warn(mp,
> > "sunit and swidth options incompatible with the noalign option");
> > @@ -2177,21 +2136,6 @@ xfs_fs_reconfigure(
> > if (error)
> > return error;
> >
> > - /* attr2 -> noattr2 */
> > - if (xfs_has_noattr2(new_mp)) {
> > - if (xfs_has_crc(mp)) {
> > - xfs_warn(mp,
> > - "attr2 is always enabled for a V5 filesystem - can't be changed.");
> > - return -EINVAL;
> > - }
> > - mp->m_features &= ~XFS_FEAT_ATTR2;
> > - mp->m_features |= XFS_FEAT_NOATTR2;
> > - } else if (xfs_has_attr2(new_mp)) {
> > - /* noattr2 -> attr2 */
> > - mp->m_features &= ~XFS_FEAT_NOATTR2;
> > - mp->m_features |= XFS_FEAT_ATTR2;
> > - }
> > -
> > /* Validate new max_atomic_write option before making other changes */
> > if (mp->m_awu_max_bytes != new_mp->m_awu_max_bytes) {
> > error = xfs_set_max_atomic_write_opt(mp,
> >
>
