korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-15 08:14:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

NFSD: Add nfsd4_encode_fattr4_fileid()

Browse Source 
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>
This commit is contained in:
Chuck Lever 2023-09-18 09:58:49 -04:00
parent 3283bf64ef
commit eb7ece81d5
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/nfsd/nfs4xdr.c
View File

@ -3137,6 +3137,12 @@ static __be32 nfsd4_encode_fattr4_filehandle(struct xdr_stream *xdr,
return nfsd4_encode_nfs_fh4(xdr, &args->fhp->fh_handle); 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 * Note: @fhp can be NULL; in this case, we might have to compose the filehandle
* ourselves. * ourselves.
@ -3361,10 +3367,9 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
goto out; goto out;
} }
if (bmval0 & FATTR4_WORD0_FILEID) { if (bmval0 & FATTR4_WORD0_FILEID) {
p = xdr_reserve_space(xdr, 8); status = nfsd4_encode_fattr4_fileid(xdr, &args);
if (!p) if (status != nfs_ok)
goto out_resource; goto out;
p = xdr_encode_hyper(p, args.stat.ino);
} }
if (bmval0 & FATTR4_WORD0_FILES_AVAIL) { if (bmval0 & FATTR4_WORD0_FILES_AVAIL) {
p = xdr_reserve_space(xdr, 8); p = xdr_reserve_space(xdr, 8);