| From bf501a4c3c20e8c590ed30a8742a12fe00f6de78 Mon Sep 17 00:00:00 2001 |
| From: "J. Bruce Fields" <bfields@redhat.com> |
| Date: Tue, 19 Nov 2019 16:05:33 -0500 |
| Subject: [PATCH] nfsd: restore NFSv3 ACL support |
| |
| commit 7c149057d044c52ed1e1d4ee50cf412c8d0f7295 upstream. |
| |
| An error in e333f3bbefe3 left the nfsd_acl_program->pg_vers array empty, |
| which effectively turned off the server's support for NFSv3 ACLs. |
| |
| Fixes: e333f3bbefe3 "nfsd: Allow containers to set supported nfs versions" |
| Cc: stable@vger.kernel.org |
| Cc: Trond Myklebust <trondmy@gmail.com> |
| Signed-off-by: J. Bruce Fields <bfields@redhat.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.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, |
| -- |
| 2.7.4 |
| |
