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;
From:   "J. R. Okajima" <hooanon05g@gmail.com>
To:     trond.myklebust@hammerspace.com, bfields@redhat.com
Cc:     linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org
Subject: [PATCH]: nfs acl: bugfix, don't use static nfsd_acl_versions[]
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-ID: <29103.1578242282.1@jrobl>
Date:   Mon, 06 Jan 2020 01:38:02 +0900
Message-ID: <29104.1578242282@jrobl>
Sender: linux-nfs-owner@vger.kernel.org
Precedence: bulk

Here is a patch to fix nfs acl.

J. R. Okajima

----------------------------------------
commit 8684b9a7c55e9283e8b21112fbdf19b4d27f36b7
Author: J. R. Okajima <hooanon05g@gmail.com>
Date:   Mon Jan 6 01:31:20 2020 +0900

    nfs acl: bugfix, don't use static nfsd_acl_versions[]
    
    By the commit for v5.2-rc1,
    e333f3bbefe3 2019-04-24 nfsd: Allow containers to set supported nfs versions
    the line to copy a value from nfsd_acl_version[] to static
    nfsd_acl_versions[] was removed.  It is OK, but nfsd_acl_versions[] is
    still set to nfsd_acl_program.pg_vers which means pg_vers has NULLs for
    its all entires and nfsacl stops working entirely.
    I am afraid the removal of static nfsd_acl_versions[] was just
    forgotten.
    
    Signed-off-by: J. R. Okajima <hooanon05g@gmail.com>

diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
index 18d94ea984ba..7f938bcb927d 100644
--- a/fs/nfsd/nfssvc.c
+++ b/fs/nfsd/nfssvc.c
@@ -94,12 +94,11 @@ static const struct svc_version *nfsd_acl_version[] = {
 
 #define NFSD_ACL_MINVERS            2
 #define NFSD_ACL_NRVERS		ARRAY_SIZE(nfsd_acl_version)
-static const struct svc_version *nfsd_acl_versions[NFSD_ACL_NRVERS];
 
 static struct svc_program	nfsd_acl_program = {
 	.pg_prog		= NFS_ACL_PROGRAM,
 	.pg_nvers		= NFSD_ACL_NRVERS,
-	.pg_vers		= nfsd_acl_versions,
+	.pg_vers		= nfsd_acl_version,
 	.pg_name		= "nfsacl",
 	.pg_class		= "nfsd",
 	.pg_stats		= &nfsd_acl_svcstats,