Commit 62f31e56 authored by Chuck Lever's avatar Chuck Lever

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: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent fa51a520
...@@ -3201,6 +3201,12 @@ static __be32 nfsd4_encode_fattr4_owner(struct xdr_stream *xdr, ...@@ -3201,6 +3201,12 @@ static __be32 nfsd4_encode_fattr4_owner(struct xdr_stream *xdr,
return nfsd4_encode_user(xdr, args->rqstp, args->stat.uid); 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 * Note: @fhp can be NULL; in this case, we might have to compose the filehandle
* ourselves. * ourselves.
...@@ -3500,8 +3506,8 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, ...@@ -3500,8 +3506,8 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
goto out; goto out;
} }
if (bmval1 & FATTR4_WORD1_OWNER_GROUP) { if (bmval1 & FATTR4_WORD1_OWNER_GROUP) {
status = nfsd4_encode_group(xdr, rqstp, args.stat.gid); status = nfsd4_encode_fattr4_owner_group(xdr, &args);
if (status) if (status != nfs_ok)
goto out; goto out;
} }
if (bmval1 & FATTR4_WORD1_RAWDEV) { if (bmval1 & FATTR4_WORD1_RAWDEV) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment