diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2023-09-18 09:58:49 -0400 |
|---|---|---|
| committer | Chuck Lever <chuck.lever@oracle.com> | 2023-10-16 12:44:17 -0400 |
| commit | eb7ece81d5fcd3d2bc54a33040967f24e7c5b317 (patch) | |
| tree | a69d117b34be231c76c0379f0db5c54feb4ec158 | |
| parent | 3283bf64ef2d9c98399e37e64a5b8d9c57c80dfe (diff) | |
| download | linux-eb7ece81d5fcd3d2bc54a33040967f24e7c5b317.tar.gz linux-eb7ece81d5fcd3d2bc54a33040967f24e7c5b317.zip | |
NFSD: Add nfsd4_encode_fattr4_fileid()
Refactor the encoder for FATTR4_FILEID 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>
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 9811b05619de..2f19f72c4407 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -3137,6 +3137,12 @@ static __be32 nfsd4_encode_fattr4_filehandle(struct xdr_stream *xdr, return nfsd4_encode_nfs_fh4(xdr, &args->fhp->fh_handle); } +static __be32 nfsd4_encode_fattr4_fileid(struct xdr_stream *xdr, + const struct nfsd4_fattr_args *args) +{ + return nfsd4_encode_uint64_t(xdr, args->stat.ino); +} + /* * Note: @fhp can be NULL; in this case, we might have to compose the filehandle * ourselves. @@ -3361,10 +3367,9 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, goto out; } if (bmval0 & FATTR4_WORD0_FILEID) { - p = xdr_reserve_space(xdr, 8); - if (!p) - goto out_resource; - p = xdr_encode_hyper(p, args.stat.ino); + status = nfsd4_encode_fattr4_fileid(xdr, &args); + if (status != nfs_ok) + goto out; } if (bmval0 & FATTR4_WORD0_FILES_AVAIL) { p = xdr_reserve_space(xdr, 8); |