From: Chuck Lever <chuck.lever@oracle.com>
Date: Mon, 18 Sep 2023 14:00:11 +0000 (-0400)
Subject: NFSD: Add nfsd4_encode_fattr4_owner_group()
X-Git-Tag: io_uring-6.7-2023-11-10~122^2~62
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=62f31e56d51a10e5c8867d64c83a3679bc71184b;p=linux-block.git

NFSD: Add nfsd4_encode_fattr4_owner_group()

Refactor the encoder for FATTR4_OWNER_GROUP into a helper. In a
subsequent patch, this helper will be called from a bitmask loop.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index c4dfa41582be..e7cbb70959d8 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -3201,6 +3201,12 @@ static __be32 nfsd4_encode_fattr4_owner(struct xdr_stream *xdr,
 	return nfsd4_encode_user(xdr, args->rqstp, args->stat.uid);
 }
 
+static __be32 nfsd4_encode_fattr4_owner_group(struct xdr_stream *xdr,
+					      const struct nfsd4_fattr_args *args)
+{
+	return nfsd4_encode_group(xdr, args->rqstp, args->stat.gid);
+}
+
 /*
  * Note: @fhp can be NULL; in this case, we might have to compose the filehandle
  * ourselves.
@@ -3500,8 +3506,8 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
 			goto out;
 	}
 	if (bmval1 & FATTR4_WORD1_OWNER_GROUP) {
-		status = nfsd4_encode_group(xdr, rqstp, args.stat.gid);
-		if (status)
+		status = nfsd4_encode_fattr4_owner_group(xdr, &args);
+		if (status != nfs_ok)
 			goto out;
 	}
 	if (bmval1 & FATTR4_WORD1_RAWDEV) {