Skip to contentSkip to conversation

xfs: remove deprecated mount and sysctl options

PATCH Superseded Pavel Reichl 3 participants 11 messages Sep 24, 2020 – Sep 25, 2020

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover xfs: remove deprecated mount and sysctl options

Hi,

by Eric and Dave's suggestion I prepared a patchset which adds warnings about using deprecated options. I tried to justify the changes in commit messages based on the info from Eric and Dave.

If this patchsed should be merged I need to know when the options are actually eliminated, so documentation can be properly updated.

Thanks.

Pavel Reichl (2):
xfs: remove deprecated mount options
xfs: remove deprecated sysctl options

 Documentation/admin-guide/xfs.rst |  5 ++++-
 fs/xfs/xfs_super.c                | 30 +++++++++++++++-----------
 fs/xfs/xfs_sysctl.c               | 36 +++++++++++++++++++++++++++++--
 3 files changed, 55 insertions(+), 16 deletions(-)
Signature · 1 line
2.26.2
#1 lore raw

PATCH 1/2 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.

---
 Documentation/admin-guide/xfs.rst |  2 ++
 fs/xfs/xfs_super.c                | 30 +++++++++++++++++-------------
 2 files changed, 19 insertions(+), 13 deletions(-)
Documentation/admin-guide/xfs.rst +2 -0
index f461d6c33534..413f68efccc0 100644
@@ -217,6 +217,8 @@ Deprecated Mount Options
 ===========================     ================
   Name				Removal Schedule
 ===========================     ================
+  ikeep/noikeep			TBD
+  attr2/noattr2			TBD
 ===========================     ================
 
 
fs/xfs/xfs_super.c +17 -13
index 71ac6c1cdc36..4c26b283b7d8 100644
@@ -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,23 @@ xfs_fc_parse_param(
 		xfs_mount_set_dax_mode(mp, result.uint_32);
 		return 0;
 #endif
+	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;
Signature · 1 line
2.26.2
#2 lore raw

Re: [PATCH 1/2] xfs: remove deprecated mount options

Quoted 19 lines · Pavel Reichl

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.

---
 Documentation/admin-guide/xfs.rst |  2 ++
 fs/xfs/xfs_super.c                | 30 +++++++++++++++++-------------
 2 files changed, 19 insertions(+), 13 deletions(-)
Documentation/admin-guide/xfs.rst +0 -0
index f461d6c33534..413f68efccc0 100644

Documentation/admin-guide/xfs.rst Deprecated Mount Options · line 221

Quoted 5 lines
Documentation/admin-guide/xfs.rst +2 -0
@@ -217,6 +217,8 @@ Deprecated Mount Options
 ===========================     ================
   Name				Removal Schedule
 ===========================     ================
+  ikeep/noikeep			TBD
+  attr2/noattr2			TBD

Er... what date did you have in mind?

Quoted 34 lines
Documentation/admin-guide/xfs.rst +0 -0
 ===========================     ================
 
 
fs/xfs/xfs_super.c +0 -13
index 71ac6c1cdc36..4c26b283b7d8 100644
@@ -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;

fs/xfs/xfs_super.c xfs_fc_parse_param( · line 1296

Quoted 6 lines
fs/xfs/xfs_super.c +3 -0
@@ -1304,6 +1291,23 @@ xfs_fc_parse_param(
 		xfs_mount_set_dax_mode(mp, result.uint_32);
 		return 0;
 #endif
+	case Opt_ikeep:
+		xfs_warn(mp, "%s mount option is deprecated.", param->key);
+		mp->m_flags |= XFS_MOUNT_IKEEP;

It's a little odd that you didn't then remove these XFS_MOUNT_ flags. It's strange to declare a mount option deprecated but still have it change behavior.

In this case, I guess we should keep ikeep/noikeep in the mount options table so that scripts won't fail, but then we remove XFS_MOUNT_IKEEP and change the codebase to always take the IKEEP behavior and delete the code that handled the !IKEEP behavior.

fs/xfs/xfs_super.c xfs_fc_parse_param( · line 1304

Quoted 8 lines
fs/xfs/xfs_super.c +8 -0
+		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;

If the kernel /does/ encounter an attr1 filesystem, what will it do now? IIRC the default (if there is no attr2/noattr2 mount option) is to auto-upgrade the fs, right? So will we stop doing that, or are we making the upgrade mandatory now?

fs/xfs/xfs_super.c xfs_fc_parse_param( · line 1309

Quoted 5 lines
fs/xfs/xfs_super.c +5 -0
+		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;

Also, uh, why move these code hunks?

--D

Quoted 7 lines
fs/xfs/xfs_super.c +1 -0
+		return 0;
 	default:
 		xfs_warn(mp, "unknown mount option [%s].", param->key);
 		return -EINVAL;
Signature · 1 line
2.26.2
#3 lore raw

Re: [PATCH 1/2] xfs: remove deprecated mount options

Quoted 64 lines · Darrick J. Wong
Quoted 19 lines · Pavel Reichl

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.

---
 Documentation/admin-guide/xfs.rst |  2 ++
 fs/xfs/xfs_super.c                | 30 +++++++++++++++++-------------
 2 files changed, 19 insertions(+), 13 deletions(-)
Documentation/admin-guide/xfs.rst +0 -0
index f461d6c33534..413f68efccc0 100644

Documentation/admin-guide/xfs.rst Deprecated Mount Options · line 221

Quoted 5 lines
Documentation/admin-guide/xfs.rst +2 -0
@@ -217,6 +217,8 @@ Deprecated Mount Options
 ===========================     ================
   Name				Removal Schedule
 ===========================     ================
+  ikeep/noikeep			TBD
+  attr2/noattr2			TBD

Er... what date did you have in mind?

Quoted 36 lines
Documentation/admin-guide/xfs.rst +0 -0
 ===========================     ================
 
 
fs/xfs/xfs_super.c +0 -13
index 71ac6c1cdc36..4c26b283b7d8 100644
@@ -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,23 @@ xfs_fc_parse_param(
 		xfs_mount_set_dax_mode(mp, result.uint_32);
 		return 0;
Quoted 8 lines

fs/xfs/xfs_super.c xfs_fc_parse_param( · line 1296

Quoted 4 lines
fs/xfs/xfs_super.c +3 -0
 #endif
+	case Opt_ikeep:
+		xfs_warn(mp, "%s mount option is deprecated.", param->key);
+		mp->m_flags |= XFS_MOUNT_IKEEP;

It's a little odd that you didn't then remove these XFS_MOUNT_ flags. It's strange to declare a mount option deprecated but still have it change behavior.

but ... this doesn't change behavior, right? The flag is still set.

I think it makes sense to announce deprecation, with a date set for future removal, but keep all other behavior the same. That gives people who still need it (if any exist) time to complain, right?

Quoted 5 lines

In this case, I guess we should keep ikeep/noikeep in the mount options table so that scripts won't fail, but then we remove XFS_MOUNT_IKEEP and change the codebase to always take the IKEEP behavior and delete the code that handled the !IKEEP behavior.

Quoted 10 lines

fs/xfs/xfs_super.c xfs_fc_parse_param( · line 1304

Quoted 8 lines
fs/xfs/xfs_super.c +8 -0
+		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;

If the kernel /does/ encounter an attr1 filesystem, what will it do now?

The same as it did yesterday; the flag is still set for now.

Quoted 11 lines

IIRC the default (if there is no attr2/noattr2 mount option) is to auto-upgrade the fs, right? So will we stop doing that, or are we making the upgrade mandatory now?

fs/xfs/xfs_super.c xfs_fc_parse_param( · line 1309

Quoted 5 lines
fs/xfs/xfs_super.c +5 -0
+		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;

Also, uh, why move these code hunks?

That's my fault, I had suggested moving all the deprecated options to the end.

Maybe with a comment, /* REMOVE ME 2089 */ or whatever we pick?

-Eric

#4 lore raw

Re: [PATCH 1/2] xfs: remove deprecated mount options

Quoted 16 lines · Eric Sandeen
Quoted 15 lines · Darrick J. Wong
Quoted 14 lines · Pavel Reichl

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.

---
 Documentation/admin-guide/xfs.rst |  2 ++
 fs/xfs/xfs_super.c                | 30 +++++++++++++++++-------------
 2 files changed, 19 insertions(+), 13 deletions(-)
Quoted 12 lines
Quoted 4 lines
Quoted 4 lines
Documentation/admin-guide/xfs.rst +0 -0
index f461d6c33534..413f68efccc0 100644
Quoted 8 lines

Documentation/admin-guide/xfs.rst Deprecated Mount Options · line 221

Quoted 6 lines
Documentation/admin-guide/xfs.rst +2 -0
@@ -217,6 +217,8 @@ Deprecated Mount Options
 ===========================     ================
   Name				Removal Schedule
 ===========================     ================
+  ikeep/noikeep			TBD
+  attr2/noattr2			TBD

Er... what date did you have in mind?

June 65th, 2089 it is, then. ;)

Quoted 45 lines
Quoted 36 lines
Quoted 36 lines
Documentation/admin-guide/xfs.rst +0 -0
 ===========================     ================
 
 
fs/xfs/xfs_super.c +0 -13
index 71ac6c1cdc36..4c26b283b7d8 100644
@@ -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,23 @@ xfs_fc_parse_param(
 		xfs_mount_set_dax_mode(mp, result.uint_32);
 		return 0;
Quoted 8 lines

fs/xfs/xfs_super.c xfs_fc_parse_param( · line 1296

Quoted 4 lines
fs/xfs/xfs_super.c +3 -0
 #endif
+	case Opt_ikeep:
+		xfs_warn(mp, "%s mount option is deprecated.", param->key);
+		mp->m_flags |= XFS_MOUNT_IKEEP;

It's a little odd that you didn't then remove these XFS_MOUNT_ flags. It's strange to declare a mount option deprecated but still have it change behavior.

Quoted 5 lines

but ... this doesn't change behavior, right? The flag is still set.

I think it makes sense to announce deprecation, with a date set for future removal, but keep all other behavior the same. That gives people who still need it (if any exist) time to complain, right?

Ok. I'm fine with these knobs continuing to affect xfs behavior right up to the deprecation date.

Quoted 5 lines
Quoted 5 lines

In this case, I guess we should keep ikeep/noikeep in the mount options table so that scripts won't fail, but then we remove XFS_MOUNT_IKEEP and change the codebase to always take the IKEEP behavior and delete the code that handled the !IKEEP behavior.

Quoted 8 lines
Quoted 8 lines

fs/xfs/xfs_super.c xfs_fc_parse_param( · line 1304

Quoted 8 lines
fs/xfs/xfs_super.c +8 -0
+		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;

Side note: shouldn't this clause be clearing XFS_MOUNT_NOATTR2?

Quoted 17 lines
Quoted 2 lines

If the kernel /does/ encounter an attr1 filesystem, what will it do now?

The same as it did yesterday; the flag is still set for now.

Quoted 11 lines

IIRC the default (if there is no attr2/noattr2 mount option) is to auto-upgrade the fs, right? So will we stop doing that, or are we making the upgrade mandatory now?

fs/xfs/xfs_super.c xfs_fc_parse_param( · line 1309

Quoted 5 lines
fs/xfs/xfs_super.c +5 -0
+		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;

Also, uh, why move these code hunks?

Quoted 3 lines

That's my fault, I had suggested moving all the deprecated options to the end.

Maybe with a comment, /* REMOVE ME 2089 */ or whatever we pick?

Ah.

--D

Quoted 1 line

-Eric

#5 lore raw

Re: [PATCH 1/2] xfs: remove deprecated mount options

that handled the !IKEEP behavior.

Quoted 12 lines
Quoted 9 lines
Quoted 9 lines

fs/xfs/xfs_super.c xfs_fc_parse_param( · line 1304

Quoted 9 lines
fs/xfs/xfs_super.c +8 -0
+		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;

Side note: shouldn't this clause be clearing XFS_MOUNT_NOATTR2?

I don't know but since nobody complained so far and we are actually starting work to remove it...I think it's safe to ignore that...?

#6 lore raw

Re: [PATCH 1/2] xfs: remove deprecated mount options

In reply to Darrick J. Wong

Thanks for discussion, if I get it right, the only thing to change is to add the date when mount options will me removed (September 2025)?

#7 lore raw

Re: [PATCH 1/2] xfs: remove deprecated mount options

Quoted 1 line · Pavel Reichl

Thanks for discussion, if I get it right, the only thing to change is to add the date when mount options will me removed (September 2025)?

Please also add a comment above the moved mount options indicating that all options below the comment are slated for deprecation.

Not sure if Darrick had anything else. Are we happy w/ the kernel logging?

#8 lore raw

Re: [PATCH 1/2] xfs: remove deprecated mount options

Quoted 7 lines · Eric Sandeen
Quoted 1 line · Pavel Reichl

Thanks for discussion, if I get it right, the only thing to change is to add the date when mount options will me removed (September 2025)?

Please also add a comment above the moved mount options indicating that all options below the comment are slated for deprecation.

Not sure if Darrick had anything else. Are we happy w/ the kernel logging?

Yeah, I'm fine with it. :)

--D

#9 lore raw

PATCH 2/2 xfs: remove deprecated sysctl options

In reply to Pavel Reichl

These optionr were for Irix compatibility, probably for clustered XFS clients in a heterogenous cluster which contained both Irix & Linux machines, so that behavior would be consistent. That doesn't exist anymore and it's no longer needed.

---
 Documentation/admin-guide/xfs.rst |  3 ++-
 fs/xfs/xfs_sysctl.c               | 36 +++++++++++++++++++++++++++++--
 2 files changed, 36 insertions(+), 3 deletions(-)
Documentation/admin-guide/xfs.rst +2 -1
index 413f68efccc0..208e17810459 100644
@@ -333,7 +333,8 @@ The following sysctls are available for the XFS filesystem:
 Deprecated Sysctls
 ==================
 
-None at present.
+fs.xfs.irix_sgid_inherit
+fs.xfs.irix_symlink_mode
 
 
 Removed Sysctls
fs/xfs/xfs_sysctl.c +34 -2
index 021ef96d0542..fac9de7ee6d0 100644
@@ -50,13 +50,45 @@ xfs_panic_mask_proc_handler(
 }
 #endif /* CONFIG_PROC_FS */
 
+STATIC int
+xfs_deprecate_irix_sgid_inherit_proc_handler(
+	struct ctl_table	*ctl,
+	int			write,
+	void			*buffer,
+	size_t			*lenp,
+	loff_t			*ppos)
+{
+	if (write) {
+		printk_once(KERN_WARNING
+				"XFS: " "%s sysctl option is deprecated.\n",
+				ctl->procname);
+	}
+	return proc_dointvec_minmax(ctl, write, buffer, lenp, ppos);
+}
+
+STATIC int
+xfs_deprecate_irix_symlink_mode_proc_handler(
+	struct ctl_table	*ctl,
+	int			write,
+	void			*buffer,
+	size_t			*lenp,
+	loff_t			*ppos)
+{
+	if (write) {
+		printk_once(KERN_WARNING
+				"XFS: " "%s sysctl option is deprecated.\n",
+				ctl->procname);
+	}
+	return proc_dointvec_minmax(ctl, write, buffer, lenp, ppos);
+}
+
 static struct ctl_table xfs_table[] = {
 	{
 		.procname	= "irix_sgid_inherit",
 		.data		= &xfs_params.sgid_inherit.val,
 		.maxlen		= sizeof(int),
 		.mode		= 0644,
-		.proc_handler	= proc_dointvec_minmax,
+		.proc_handler	= xfs_deprecate_irix_sgid_inherit_proc_handler,
 		.extra1		= &xfs_params.sgid_inherit.min,
 		.extra2		= &xfs_params.sgid_inherit.max
 	},
@@ -65,7 +97,7 @@ static struct ctl_table xfs_table[] = {
 		.data		= &xfs_params.symlink_mode.val,
 		.maxlen		= sizeof(int),
 		.mode		= 0644,
-		.proc_handler	= proc_dointvec_minmax,
+		.proc_handler	= xfs_deprecate_irix_symlink_mode_proc_handler,
 		.extra1		= &xfs_params.symlink_mode.min,
 		.extra2		= &xfs_params.symlink_mode.max
 	},
Signature · 1 line
2.26.2
#10 lore raw

Re: [PATCH 2/2] xfs: remove deprecated sysctl options

Quoted 16 lines · Pavel Reichl

These optionr were for Irix compatibility, probably for clustered XFS clients in a heterogenous cluster which contained both Irix & Linux machines, so that behavior would be consistent. That doesn't exist anymore and it's no longer needed.

---
 Documentation/admin-guide/xfs.rst |  3 ++-
 fs/xfs/xfs_sysctl.c               | 36 +++++++++++++++++++++++++++++--
 2 files changed, 36 insertions(+), 3 deletions(-)
Documentation/admin-guide/xfs.rst +0 -0
index 413f68efccc0..208e17810459 100644

Documentation/admin-guide/xfs.rst The following sysctls are available for the XFS filesystem: · line 337

Quoted 6 lines
Documentation/admin-guide/xfs.rst +2 -1
@@ -333,7 +333,8 @@ The following sysctls are available for the XFS filesystem:
 Deprecated Sysctls
 ==================
 
-None at present.
+fs.xfs.irix_sgid_inherit
+fs.xfs.irix_symlink_mode

When will these be removed from sysctl?

Quoted 35 lines
Documentation/admin-guide/xfs.rst +0 -0
 Removed Sysctls
fs/xfs/xfs_sysctl.c +26 -0
index 021ef96d0542..fac9de7ee6d0 100644
@@ -50,13 +50,45 @@ xfs_panic_mask_proc_handler(
 }
 #endif /* CONFIG_PROC_FS */
 
+STATIC int
+xfs_deprecate_irix_sgid_inherit_proc_handler(
+	struct ctl_table	*ctl,
+	int			write,
+	void			*buffer,
+	size_t			*lenp,
+	loff_t			*ppos)
+{
+	if (write) {
+		printk_once(KERN_WARNING
+				"XFS: " "%s sysctl option is deprecated.\n",
+				ctl->procname);
+	}
+	return proc_dointvec_minmax(ctl, write, buffer, lenp, ppos);
+}
+
+STATIC int
+xfs_deprecate_irix_symlink_mode_proc_handler(
+	struct ctl_table	*ctl,
+	int			write,
+	void			*buffer,
+	size_t			*lenp,
+	loff_t			*ppos)
+{
+	if (write) {
+		printk_once(KERN_WARNING

fs/xfs/xfs_sysctl.c xfs_panic_mask_proc_handler( · line 88

Quoted 10 lines
fs/xfs/xfs_sysctl.c +6 -0
+				"XFS: " "%s sysctl option is deprecated.\n",
+				ctl->procname);
+	}
+	return proc_dointvec_minmax(ctl, write, buffer, lenp, ppos);
+}
+
 static struct ctl_table xfs_table[] = {
 	{
 		.procname	= "irix_sgid_inherit",
 		.data		= &xfs_params.sgid_inherit.val,

Same comments as the last patch regarding a sysctl that spits out deprecation warnings but continues to actually change xfs' behavior...

--D

Quoted 19 lines
fs/xfs/xfs_sysctl.c +2 -2
 		.maxlen		= sizeof(int),
 		.mode		= 0644,
-		.proc_handler	= proc_dointvec_minmax,
+		.proc_handler	= xfs_deprecate_irix_sgid_inherit_proc_handler,
 		.extra1		= &xfs_params.sgid_inherit.min,
 		.extra2		= &xfs_params.sgid_inherit.max
 	},
@@ -65,7 +97,7 @@ static struct ctl_table xfs_table[] = {
 		.data		= &xfs_params.symlink_mode.val,
 		.maxlen		= sizeof(int),
 		.mode		= 0644,
-		.proc_handler	= proc_dointvec_minmax,
+		.proc_handler	= xfs_deprecate_irix_symlink_mode_proc_handler,
 		.extra1		= &xfs_params.symlink_mode.min,
 		.extra2		= &xfs_params.symlink_mode.max
 	},
Signature · 1 line
2.26.2