Skip to content

Commit

Permalink
NFSD: Add nfsd4_encode_fattr4_space_used()
Browse files Browse the repository at this point in the history
Refactor the encoder for FATTR4_SPACE_USED 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 d0cde97 commit 6d37ac3
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions fs/nfsd/nfs4xdr.c
Original file line number Diff line number Diff line change
Expand Up @@ -3249,6 +3249,12 @@ static __be32 nfsd4_encode_fattr4_space_total(struct xdr_stream *xdr,
return nfsd4_encode_uint64_t(xdr, total);
}

static __be32 nfsd4_encode_fattr4_space_used(struct xdr_stream *xdr,
const struct nfsd4_fattr_args *args)
{
return nfsd4_encode_uint64_t(xdr, (u64)args->stat.blocks << 9);
}

/*
* Note: @fhp can be NULL; in this case, we might have to compose the filehandle
* ourselves.
Expand All @@ -3267,7 +3273,6 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
__be32 *p, *attrlen_p;
int starting_len = xdr->buf->len;
int attrlen_offset;
u64 dummy64;
__be32 status;
int err;
#ifdef CONFIG_NFSD_V4_SECURITY_LABEL
Expand Down Expand Up @@ -3573,11 +3578,9 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
goto out;
}
if (bmval1 & FATTR4_WORD1_SPACE_USED) {
p = xdr_reserve_space(xdr, 8);
if (!p)
goto out_resource;
dummy64 = (u64)args.stat.blocks << 9;
p = xdr_encode_hyper(p, dummy64);
status = nfsd4_encode_fattr4_space_used(xdr, &args);
if (status != nfs_ok)
goto out;
}
if (bmval1 & FATTR4_WORD1_TIME_ACCESS) {
status = nfsd4_encode_nfstime4(xdr, &args.stat.atime);
Expand Down

0 comments on commit 6d37ac3

Please sign in to comment.