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

Commit f57a024e authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

GFS2: Remove ignore_local_fs mount argument 



This is been a no-op for a very long time now. I'm pretty sure
nobody uses it, but just in case we'll still accept it on the
command line, but ignore it.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 8d123585

fs/gfs2/incore.h

+0 −1
Original line number Diff line number Diff line
@@ -416,7 +416,6 @@ struct gfs2_args { 
	char ar_locktable[GFS2_LOCKNAME_LEN];	/* Name of the Lock Table */

	char ar_hostdata[GFS2_LOCKNAME_LEN];	/* Host specific data */

	unsigned int ar_spectator:1;		/* Don't get a journal */

	unsigned int ar_ignore_local_fs:1;	/* Ignore optimisations */

	unsigned int ar_localflocks:1;		/* Let the VFS do flock|fcntl */

	unsigned int ar_localcaching:1;		/* Local caching */

	unsigned int ar_debug:1;		/* Oops on errors */

fs/gfs2/super.c

+1 −4
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ int gfs2_mount_args(struct gfs2_args *args, char *options) 
			args->ar_spectator = 1;

			break;

		case Opt_ignore_local_fs:

			args->ar_ignore_local_fs = 1;

			/* Retained for backwards compat only */

			break;

		case Opt_localflocks:

			args->ar_localflocks = 1;
@@ -1128,7 +1128,6 @@ static int gfs2_remount_fs(struct super_block *sb, int *flags, char *data) 


	/* Some flags must not be changed */

	if (args_neq(&args, &sdp->sd_args, spectator) ||

	    args_neq(&args, &sdp->sd_args, ignore_local_fs) ||

	    args_neq(&args, &sdp->sd_args, localflocks) ||

	    args_neq(&args, &sdp->sd_args, localcaching) ||

	    args_neq(&args, &sdp->sd_args, meta))
@@ -1233,8 +1232,6 @@ static int gfs2_show_options(struct seq_file *s, struct vfsmount *mnt) 
		seq_printf(s, ",hostdata=%s", args->ar_hostdata);

	if (args->ar_spectator)

		seq_printf(s, ",spectator");

	if (args->ar_ignore_local_fs)

		seq_printf(s, ",ignore_local_fs");

	if (args->ar_localflocks)

		seq_printf(s, ",localflocks");

	if (args->ar_localcaching)