aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2023-09-18 10:00:11 -0400
committerChuck Lever <chuck.lever@oracle.com>2023-10-16 12:44:21 -0400
commit62f31e56d51a10e5c8867d64c83a3679bc71184b (patch)
treeb459528c7c872e2f240562f17a559247afa65647 /fs/nfsd
parentfa51a5201bb90a4cf291b5ad5f6ee1af8be5548c (diff)
downloadlinux-62f31e56d51a10e5c8867d64c83a3679bc71184b.tar.gz
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>
Diffstat (limited to 'fs/nfsd')
-rw-r--r--fs/nfsd/nfs4xdr.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index c4dfa41582be8..e7cbb70959d8e 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) {