Skip to content

Commit

Permalink
NFSD: Add nfsd4_encode_fattr4_suppattr_exclcreat()
Browse files Browse the repository at this point in the history
Refactor the encoder for FATTR4_SUPPATTR_EXCLCREAT 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>
  • Loading branch information
Chuck Lever committed Oct 16, 2023
1 parent 4c58473 commit 345c387
Showing 1 changed file with 15 additions and 8 deletions.
23 changes: 15 additions & 8 deletions fs/nfsd/nfs4xdr.c
Original file line number Diff line number Diff line change
Expand Up @@ -3320,6 +3320,20 @@ static __be32 nfsd4_encode_fattr4_layout_blksize(struct xdr_stream *xdr,

#endif

static __be32 nfsd4_encode_fattr4_suppattr_exclcreat(struct xdr_stream *xdr,
const struct nfsd4_fattr_args *args)
{
struct nfsd4_compoundres *resp = args->rqstp->rq_resp;
u32 supp[3];

memcpy(supp, nfsd_suppattrs[resp->cstate.minorversion], sizeof(supp));
supp[0] &= NFSD_SUPPATTR_EXCLCREAT_WORD0;
supp[1] &= NFSD_SUPPATTR_EXCLCREAT_WORD1;
supp[2] &= NFSD_SUPPATTR_EXCLCREAT_WORD2;

return nfsd4_encode_bitmap4(xdr, supp[0], supp[1], supp[2]);
}

/*
* Note: @fhp can be NULL; in this case, we might have to compose the filehandle
* ourselves.
Expand Down Expand Up @@ -3698,14 +3712,7 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
}
#endif /* CONFIG_NFSD_PNFS */
if (bmval2 & FATTR4_WORD2_SUPPATTR_EXCLCREAT) {
u32 supp[3];

memcpy(supp, nfsd_suppattrs[minorversion], sizeof(supp));
supp[0] &= NFSD_SUPPATTR_EXCLCREAT_WORD0;
supp[1] &= NFSD_SUPPATTR_EXCLCREAT_WORD1;
supp[2] &= NFSD_SUPPATTR_EXCLCREAT_WORD2;

status = nfsd4_encode_bitmap4(xdr, supp[0], supp[1], supp[2]);
status = nfsd4_encode_fattr4_suppattr_exclcreat(xdr, &args);
if (status)
goto out;
}
Expand Down

0 comments on commit 345c387

Please sign in to comment.