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

NFSD: Add nfsd4_encode_fattr4_owner()

Refactor the encoder for FATTR4_OWNER 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 e1654b69506e..c4dfa41582be 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -3195,6 +3195,12 @@ static __be32 nfsd4_encode_fattr4_numlinks(struct xdr_stream *xdr,
 	return nfsd4_encode_uint32_t(xdr, args->stat.nlink);
 }
 
+static __be32 nfsd4_encode_fattr4_owner(struct xdr_stream *xdr,
+					const struct nfsd4_fattr_args *args)
+{
+	return nfsd4_encode_user(xdr, args->rqstp, args->stat.uid);
+}
+
 /*
  * Note: @fhp can be NULL; in this case, we might have to compose the filehandle
  * ourselves.
@@ -3489,8 +3495,8 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
 			goto out;
 	}
 	if (bmval1 & FATTR4_WORD1_OWNER) {
-		status = nfsd4_encode_user(xdr, rqstp, args.stat.uid);
-		if (status)
+		status = nfsd4_encode_fattr4_owner(xdr, &args);
+		if (status != nfs_ok)
 			goto out;
 	}
 	if (bmval1 & FATTR4_WORD1_OWNER_GROUP) {