diff mbox series

[v3,17/26] NFS: Constify mount argument match tables

Message ID	20190911161621.19832-18-smayhew@redhat.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=f+aV=XG=vger.kernel.org=linux-nfs-owner@kernel.org> From: Scott Mayhew <smayhew@redhat.com> To: anna.schumaker@netapp.com, trond.myklebust@hammerspace.com Cc: dhowells@redhat.com, viro@zeniv.linux.org.uk, linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 17/26] NFS: Constify mount argument match tables Date: Wed, 11 Sep 2019 12:16:12 -0400 Message-Id: <20190911161621.19832-18-smayhew@redhat.com> In-Reply-To: <20190911161621.19832-1-smayhew@redhat.com> References: <20190911161621.19832-1-smayhew@redhat.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk
Series	nfs: Mount API conversion \| expand [v3,00/26] nfs: Mount API conversion [v3,01/26] saner calling conventions for nfs_fs_mount_common() [v3,02/26] nfs: stash server into struct nfs_mount_info [v3,03/26] nfs: lift setting mount_info from nfs4_remote{,_referral}_mount [v3,04/26] nfs: fold nfs4_remote_fs_type and nfs4_remote_referral_fs_type [v3,05/26] nfs: don't bother setting/restoring export_path around do_nfs_root_mount() [v3,06/26] nfs4: fold nfs_do_root_mount/nfs_follow_remote_path [v3,07/26] nfs: lift setting mount_info from nfs_xdev_mount() [v3,08/26] nfs: stash nfs_subversion reference into nfs_mount_info [v3,09/26] nfs: don't bother passing nfs_subversion to ->try_mount() and nfs_fs_mount_common() [v3,10/26] nfs: merge xdev and remote file_system_type [v3,11/26] nfs: unexport nfs_fs_mount_common() [v3,12/26] nfs: don't pass nfs_subversion to ->create_server() [v3,13/26] nfs: get rid of mount_info ->fill_super() [v3,14/26] nfs_clone_sb_security(): simplify the check for server bogosity [v3,15/26] nfs: get rid of ->set_security() [v3,16/26] NFS: Move mount parameterisation bits into their own file [v3,17/26] NFS: Constify mount argument match tables [v3,18/26] NFS: Rename struct nfs_parsed_mount_data to struct nfs_fs_context [v3,19/26] NFS: Split nfs_parse_mount_options() [v3,20/26] NFS: Deindent nfs_fs_context_parse_option() [v3,21/26] NFS: Add a small buffer in nfs_fs_context to avoid string dup [v3,22/26] NFS: Do some tidying of the parsing code [v3,23/26] NFS: rename nfs_fs_context pointer arg in a few functions [v3,24/26] NFS: Convert mount option parsing to use functionality from fs_parser.h [v3,25/26] NFS: Add fs_context support. [v3,26/26] NFS: Attach supplementary error information to fs_context.

Commit Message

Scott Mayhew Sept. 11, 2019, 4:16 p.m. UTC

From: David Howells <dhowells@redhat.com>

The mount argument match tables should never be altered so constify them.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
 fs/nfs/fs_context.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/fs/nfs/fs_context.c b/fs/nfs/fs_context.c
index 82b312a5cdde..967c684b26d2 100644
--- a/fs/nfs/fs_context.c
+++ b/fs/nfs/fs_context.c
@@ -203,7 +203,7 @@  enum {
 	Opt_lookupcache_err
 };
 
-static match_table_t nfs_lookupcache_tokens = {
+static const match_table_t nfs_lookupcache_tokens = {
 	{ Opt_lookupcache_all, "all" },
 	{ Opt_lookupcache_positive, "pos" },
 	{ Opt_lookupcache_positive, "positive" },
@@ -219,7 +219,7 @@  enum {
 	Opt_local_lock_err
 };
 
-static match_table_t nfs_local_lock_tokens = {
+static const match_table_t nfs_local_lock_tokens = {
 	{ Opt_local_lock_all, "all" },
 	{ Opt_local_lock_flock, "flock" },
 	{ Opt_local_lock_posix, "posix" },
@@ -235,7 +235,7 @@  enum {
 	Opt_vers_err
 };
 
-static match_table_t nfs_vers_tokens = {
+static const match_table_t nfs_vers_tokens = {
 	{ Opt_vers_2, "2" },
 	{ Opt_vers_3, "3" },
 	{ Opt_vers_4, "4" },