Commit d0cde979 authored by Chuck Lever's avatar Chuck Lever

NFSD: Add nfsd4_encode_fattr4_space_total()

Refactor the encoder for FATTR4_SPACE_TOTAL 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 74ebc697
...@@ -3241,6 +3241,14 @@ static __be32 nfsd4_encode_fattr4_space_free(struct xdr_stream *xdr, ...@@ -3241,6 +3241,14 @@ static __be32 nfsd4_encode_fattr4_space_free(struct xdr_stream *xdr,
return nfsd4_encode_uint64_t(xdr, free); return nfsd4_encode_uint64_t(xdr, free);
} }
static __be32 nfsd4_encode_fattr4_space_total(struct xdr_stream *xdr,
const struct nfsd4_fattr_args *args)
{
u64 total = (u64)args->statfs.f_blocks * (u64)args->statfs.f_bsize;
return nfsd4_encode_uint64_t(xdr, total);
}
/* /*
* 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.
...@@ -3560,11 +3568,9 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, ...@@ -3560,11 +3568,9 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
goto out; goto out;
} }
if (bmval1 & FATTR4_WORD1_SPACE_TOTAL) { if (bmval1 & FATTR4_WORD1_SPACE_TOTAL) {
p = xdr_reserve_space(xdr, 8); status = nfsd4_encode_fattr4_space_total(xdr, &args);
if (!p) if (status != nfs_ok)
goto out_resource; goto out;
dummy64 = (u64)args.statfs.f_blocks * (u64)args.statfs.f_bsize;
p = xdr_encode_hyper(p, dummy64);
} }
if (bmval1 & FATTR4_WORD1_SPACE_USED) { if (bmval1 & FATTR4_WORD1_SPACE_USED) {
p = xdr_reserve_space(xdr, 8); p = xdr_reserve_space(xdr, 8);
......
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