diff options
| author |   J. Bruce Fields <bfields@redhat.com> | 2019-11-19 16:05:33 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2019-11-19 17:43:05 -0500 |
| commit | 7c149057d044c52ed1e1d4ee50cf412c8d0f7295 (patch) | |
| tree | dee4be7013501fce51267192b817d2581add0af5 /fs/nfsd | |
| parent | nfsd: v4 support requires CRYPTO_SHA256 (diff) | |
| download | linux-dev-7c149057d044c52ed1e1d4ee50cf412c8d0f7295.tar.xz linux-dev-7c149057d044c52ed1e1d4ee50cf412c8d0f7295.zip | |
nfsd: restore NFSv3 ACL support
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>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfssvc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index fdf7ed4bd5dd..e8bee8ff30c5 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c @@ -95,12 +95,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, |