Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 444a7022 authored by Eric Sandeen's avatar Eric Sandeen Committed by Dave Chinner
Browse files

xfs: remove deprecated mount options 



We recently removed deprecated sysctls; may as well
remove deprecated mount options as well, we've stated
that they'd be gone by now in the docs.

Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarCarlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 3790a8cd

Documentation/filesystems/xfs.txt

+9 −20
Original line number Diff line number Diff line
@@ -228,30 +228,19 @@ default behaviour. 
Deprecated Mount Options

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



  delaylog/nodelaylog

	Delayed logging is the only logging method that XFS supports

	now, so these mount options are now ignored.



	Due for removal in 3.12.



  ihashsize=value

	In memory inode hashes have been removed, so this option has

	no function as of August 2007. Option is deprecated.



	Due for removal in 3.12.

None at present.



  irixsgid

	This behaviour is now controlled by a sysctl, so the mount

	option is ignored.



	Due for removal in 3.12.

Removed Mount Options

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



  osyncisdsync

  osyncisosync

	O_SYNC and O_DSYNC are fully supported, so there is no need

	for these options any more.

  Name				Removed

  ----				-------

  delaylog/nodelaylog		v3.20

  ihashsize			v3.20

  irixsgid			v3.20

  osyncisdsync/osyncisosync	v3.20



	Due for removal in 3.12.



sysctls

=======

fs/xfs/xfs_super.c

+0 −20
Original line number Diff line number Diff line
@@ -109,8 +109,6 @@ static struct xfs_kobj xfs_dbg_kobj; /* global debug sysfs attrs */ 
#define MNTOPT_GQUOTANOENF "gqnoenforce"/* group quota limit enforcement */

#define MNTOPT_PQUOTANOENF "pqnoenforce"/* project quota limit enforcement */

#define MNTOPT_QUOTANOENF  "qnoenforce"	/* same as uqnoenforce */

#define MNTOPT_DELAYLOG    "delaylog"	/* Delayed logging enabled */

#define MNTOPT_NODELAYLOG  "nodelaylog"	/* Delayed logging disabled */

#define MNTOPT_DISCARD	   "discard"	/* Discard unused blocks */

#define MNTOPT_NODISCARD   "nodiscard"	/* Do not discard unused blocks */
@@ -361,28 +359,10 @@ xfs_parseargs( 
		} else if (!strcmp(this_char, MNTOPT_GQUOTANOENF)) {

			mp->m_qflags |= (XFS_GQUOTA_ACCT | XFS_GQUOTA_ACTIVE);

			mp->m_qflags &= ~XFS_GQUOTA_ENFD;

		} else if (!strcmp(this_char, MNTOPT_DELAYLOG)) {

			xfs_warn(mp,

	"delaylog is the default now, option is deprecated.");

		} else if (!strcmp(this_char, MNTOPT_NODELAYLOG)) {

			xfs_warn(mp,

	"nodelaylog support has been removed, option is deprecated.");

		} else if (!strcmp(this_char, MNTOPT_DISCARD)) {

			mp->m_flags |= XFS_MOUNT_DISCARD;

		} else if (!strcmp(this_char, MNTOPT_NODISCARD)) {

			mp->m_flags &= ~XFS_MOUNT_DISCARD;

		} else if (!strcmp(this_char, "ihashsize")) {

			xfs_warn(mp,

	"ihashsize no longer used, option is deprecated.");

		} else if (!strcmp(this_char, "osyncisdsync")) {

			xfs_warn(mp,

	"osyncisdsync has no effect, option is deprecated.");

		} else if (!strcmp(this_char, "osyncisosync")) {

			xfs_warn(mp,

	"osyncisosync has no effect, option is deprecated.");

		} else if (!strcmp(this_char, "irixsgid")) {

			xfs_warn(mp,

	"irixsgid is now a sysctl(2) variable, option is deprecated.");

		} else {

			xfs_warn(mp, "unknown mount option [%s].", this_char);

			return -EINVAL;