[PATCH v1 17/17] NFSD: Map every NFS_ACLv2 reply status into aclstat2

[Chuck Lever <cel@kernel.org>]

nfsacld_map_status() translates only the three fh_verify() statuses
that have no NFSv2 equivalent, so every other status reaches the
encoder unchanged. fh_verify() returns nfserr_perm for a request from
an insecure port, and both it and fh_getattr() pass errno values
through nfserrno(), which yields nfserr_jukebox for ENOMEM, EAGAIN,
and ETIMEDOUT and nfserr_serverfault for an errno its table does not
list. NFS_ACL version 2 shares its status space with NFSv2, so 10008
and 10006 are values an NFS_ACLv2 client cannot interpret.
draft-ietf-nfsv4-nfs-acl Section 5.1.5 lists the status values an
NFS_ACLv2 server returns, and these are not among them.

Pass through the statuses that are members of aclstat2 and map the
rest to ACL2ERR_IO, the status nfsacld_map_errno() already uses for
an unlisted errno. Translate nfserr_notsupp to ACL2ERR_NOTSUPP, the
status nfsacld_map_errno() returns for EOPNOTSUPP. The existing
BADHANDLE, NOFILEHANDLE, and WRONGSEC translations are unchanged.

Signed-off-by: Chuck Lever <cel@kernel.org>
---
 fs/nfsd/nfs2acl.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c
index a805d2ac76db..b4ab0bb1808d 100644
--- a/fs/nfsd/nfs2acl.c
+++ b/fs/nfsd/nfs2acl.c
@@ -187,15 +187,28 @@ static __be32 nfsacld_map_errno(int errno)
 static __be32 nfsacld_map_status(__be32 status)
 {
 	switch (status) {
+	case acl2_ok:
+	case acl2err_perm:
+	case acl2err_noent:
+	case acl2err_io:
+	case acl2err_acces:
+	case acl2err_inval:
+	case acl2err_nospc:
+	case acl2err_rofs:
+	case acl2err_notsupp:
+	case acl2err_dquot:
+	case acl2err_stale:
+		return status;
 	case cpu_to_be32(NFS4ERR_NOFILEHANDLE):
 	case cpu_to_be32(NFS3ERR_BADHANDLE):
-		status = acl2err_stale;
-		break;
+		return acl2err_stale;
 	case cpu_to_be32(NFS4ERR_WRONGSEC):
-		status = acl2err_acces;
-		break;
+		return acl2err_acces;
+	case cpu_to_be32(NFS3ERR_NOTSUPP):
+		return acl2err_notsupp;
+	default:
+		return acl2err_io;
 	}
-	return status;
 }
 
 /*
-- 
2.56.0