Skip to contentSkip to conversation

nfsd: restore NFSv3 ACL support

PATCH New J. Bruce Fields 1 participant 1 message Nov 20, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nfsd: restore NFSv3 ACL support

From: "J. Bruce Fields" <[email protected]>

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 Trond Myklebust <[email protected]>
---
 fs/nfsd/nfssvc.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Kinda wondering if it says something that server NFSv3 ACL support was off in 5.2 and 5.3 and nobody noticed. (At least I don't recall any reports.)

fs/nfsd/nfssvc.c +1 -2
index fdf7ed4bd5dd..e8bee8ff30c5 100644
@@ -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,
Signature · 1 line
2.23.0