Received: by 2002:a25:c593:0:0:0:0:0 with SMTP id v141csp2479048ybe; Tue, 3 Sep 2019 13:34:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqz/O1mdSO5i42oRrKNfAeZApqy+5W2zfOV6SnYYXudoxMBvOhDr5Qf3XyklPerVnIDbEpOw X-Received: by 2002:a63:ec13:: with SMTP id j19mr31501885pgh.369.1567542860317; Tue, 03 Sep 2019 13:34:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567542860; cv=none; d=google.com; s=arc-20160816; b=sISzn6StVt1q+DP0g4lpJKi3Ros39KnHTZmZCQa2Nlm8+mcppyAtyy/4DUOSEqpo1Z MUkns6tJdMAX8Hq1R4Y7P0xXsFPxTlQ+oM+nQN+te7VDIlnqEFNk6bDlZ3U3t8v4KiCe sQRnLNZVFb9LiZJ4+qQnKIjHUFLDhrsxVtvB32e3F7nc0vSx07Bf5mSq6QS8U5+pbh3S geLzdwRxFJ12iYjwWj01NVkRmrldBihyVxGbUGQuDetr5l5LdcPfDuai62GV9UOqGevd gKFNnUAWVknY3bc9yAvLhdNlQkGqSRbEHP0FR3K+gymLzgg5frAhMZAA6KN/2YkOCQcX PMpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=38Ybc1cWTOoTFBXOfAqBX7SCG9fGvL/zXlsQx4F3xpc=; b=GI9iwzcQRd1nS49Adc4S2E2peOTv8WeDYCWNTEoG16bAtJ0GUf/qbRHjZnvBdcU+EY mx2sbt045qXYixYPKKcWQ2DsHFfoDlHQVU/gm7pW2bd9KzDkb0oEmwgkJo1BDOVV2sbo wU2EiZ76DbsvfC9DtaXdbisQBirhPgWtRIFNj1JqeiBkh3M8N8Zo6/dWsC+EA/XWco05 9ljRRF8yWjm2TpwVBiw4np2nfmlvb9rgdlEtCJ/Xja9+iBz8UzkvWE0KpSPgM6H4SNTd izOkGMUEnx3takHwz8/lTHKqELW8vBpNSM7pUDyRUisFU1ma7jyCG/oS4sKYJm7eBp/q 1+GA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u9si13213629plr.51.2019.09.03.13.34.06; Tue, 03 Sep 2019 13:34:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728141AbfICUdW (ORCPT + 99 others); Tue, 3 Sep 2019 16:33:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34232 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727175AbfICUcS (ORCPT ); Tue, 3 Sep 2019 16:32:18 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1D3A718C4269; Tue, 3 Sep 2019 20:32:18 +0000 (UTC) Received: from coeurl.usersys.redhat.com (ovpn-121-35.rdu2.redhat.com [10.10.121.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 731C360C18; Tue, 3 Sep 2019 20:32:17 +0000 (UTC) Received: by coeurl.usersys.redhat.com (Postfix, from userid 1000) id CCE3420D5C; Tue, 3 Sep 2019 16:32:15 -0400 (EDT) From: Scott Mayhew To: trond.myklebust@hammerspace.com, anna.schumaker@netapp.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 v2 17/26] NFS: Constify mount argument match tables Date: Tue, 3 Sep 2019 16:32:06 -0400 Message-Id: <20190903203215.9157-18-smayhew@redhat.com> In-Reply-To: <20190903203215.9157-1-smayhew@redhat.com> References: <20190903203215.9157-1-smayhew@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.62]); Tue, 03 Sep 2019 20:32:18 +0000 (UTC) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: David Howells The mount argument match tables should never be altered so constify them. Signed-off-by: David Howells Signed-off-by: Al Viro --- fs/nfs/fs_context.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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" }, -- 2.17.2