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

Commit a6d5ff64 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

NFS: Clean up fscache_uniq mount option 



Clean up: fscache_uniq takes a string, so it should be included
with the other string mount option definitions, by convention.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 0f15c53d

fs/nfs/super.c

+9 −9
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ static const match_table_t nfs_mount_option_tokens = { 
	{ Opt_resvport, "resvport" },

	{ Opt_noresvport, "noresvport" },

	{ Opt_fscache, "fsc" },

	{ Opt_fscache_uniq, "fsc=%s" },

	{ Opt_nofscache, "nofsc" },



	{ Opt_port, "port=%s" },
@@ -171,6 +170,7 @@ static const match_table_t nfs_mount_option_tokens = { 
	{ Opt_mountaddr, "mountaddr=%s" },



	{ Opt_lookupcache, "lookupcache=%s" },

	{ Opt_fscache_uniq, "fsc=%s" },



	{ Opt_err, NULL }

};
@@ -1050,14 +1050,6 @@ static int nfs_parse_mount_options(char *raw, 
			kfree(mnt->fscache_uniq);

			mnt->fscache_uniq = NULL;

			break;

		case Opt_fscache_uniq:

			string = match_strdup(args);

			if (!string)

				goto out_nomem;

			kfree(mnt->fscache_uniq);

			mnt->fscache_uniq = string;

			mnt->options |= NFS_OPTION_FSCACHE;

			break;



		/*

		 * options that take numeric values
@@ -1388,6 +1380,14 @@ static int nfs_parse_mount_options(char *raw, 
					return 0;

			};

			break;

		case Opt_fscache_uniq:

			string = match_strdup(args);

			if (string == NULL)

				goto out_nomem;

			kfree(mnt->fscache_uniq);

			mnt->fscache_uniq = string;

			mnt->options |= NFS_OPTION_FSCACHE;

			break;



		/*

		 * Special options