mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 22:26:55 +00:00
Code Issues Releases Wiki Activity

NFSD: Add nfsd4_encode_fattr4_fs_layout_types()

Browse source 
Refactor the encoder for FATTR4_FS_LAYOUT_TYPES 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 10:01:28 -04:00
parent 1b9097e366
commit e7a5b1b2ad
1 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
fs/nfsd/nfs4xdr.c
View file

@ -3293,6 +3293,28 @@ static __be32 nfsd4_encode_fattr4_mounted_on_fileid(struct xdr_stream *xdr,
return nfsd4_encode_uint64_t(xdr, ino);
}
#ifdef CONFIG_NFSD_PNFS
static __be32 nfsd4_encode_fattr4_fs_layout_types(struct xdr_stream *xdr,
const struct nfsd4_fattr_args *args)
{
unsigned long mask = args->exp->ex_layout_types;
int i;
/* Hamming weight of @mask is the number of layout types to return */
if (xdr_stream_encode_u32(xdr, hweight_long(mask)) != XDR_UNIT)
return nfserr_resource;
for (i = LAYOUT_NFSV4_1_FILES; i < LAYOUT_TYPE_MAX; ++i)
if (mask & BIT(i)) {
/* layouttype4 */
if (xdr_stream_encode_u32(xdr, i) != XDR_UNIT)
return nfserr_resource;
}
return nfs_ok;
}
#endif
/*
* Note: @fhp can be NULL; in this case, we might have to compose the filehandle
* ourselves.
@ -3653,7 +3675,7 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
}
#ifdef CONFIG_NFSD_PNFS
if (bmval1 & FATTR4_WORD1_FS_LAYOUT_TYPES) {
status = nfsd4_encode_layout_types(xdr, exp->ex_layout_types);
status = nfsd4_encode_fattr4_fs_layout_types(xdr, &args);
if (status)
goto out;
}