nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

NFSD: Update the NFSv3 PATHCONF3res encoder to use struct xdr_stream

Browse source 
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever 2020-11-06 13:15:09 -05:00
parent 0a139d1b7f
commit ded04a587f
2 changed files with 49 additions and 13 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

44
fs/nfsd/nfs3xdr.c
View file

@ -1501,25 +1501,47 @@ nfs3svc_encode_fsinfores(struct svc_rqst *rqstp, __be32 *p)
return 1; return 1;
} }
static bool
svcxdr_encode_pathconf3resok(struct xdr_stream *xdr,
const struct nfsd3_pathconfres *resp)
{
__be32 *p;
p = xdr_reserve_space(xdr, XDR_UNIT * 6);
if (!p)
return false;
*p++ = cpu_to_be32(resp->p_link_max);
*p++ = cpu_to_be32(resp->p_name_max);
p = xdr_encode_bool(p, resp->p_no_trunc);
p = xdr_encode_bool(p, resp->p_chown_restricted);
p = xdr_encode_bool(p, resp->p_case_insensitive);
xdr_encode_bool(p, resp->p_case_preserving);
return true;
}
/* PATHCONF */ /* PATHCONF */
int int
nfs3svc_encode_pathconfres(struct svc_rqst *rqstp, __be32 *p) nfs3svc_encode_pathconfres(struct svc_rqst *rqstp, __be32 *p)
{ {
struct xdr_stream *xdr = &rqstp->rq_res_stream;
struct nfsd3_pathconfres *resp = rqstp->rq_resp; struct nfsd3_pathconfres *resp = rqstp->rq_resp;
*p++ = resp->status; if (!svcxdr_encode_nfsstat3(xdr, resp->status))
*p++ = xdr_zero; /* no post_op_attr */ return 0;
switch (resp->status) {
if (resp->status == 0) { case nfs_ok:
*p++ = htonl(resp->p_link_max); if (!svcxdr_encode_post_op_attr(rqstp, xdr, &nfs3svc_null_fh))
*p++ = htonl(resp->p_name_max); return 0;
*p++ = htonl(resp->p_no_trunc); if (!svcxdr_encode_pathconf3resok(xdr, resp))
*p++ = htonl(resp->p_chown_restricted); return 0;
*p++ = htonl(resp->p_case_insensitive); break;
*p++ = htonl(resp->p_case_preserving); default:
if (!svcxdr_encode_post_op_attr(rqstp, xdr, &nfs3svc_null_fh))
return 0;
} }
return xdr_ressize_check(rqstp, p); return 1;
} }
/* COMMIT */ /* COMMIT */

18
include/linux/sunrpc/xdr.h
View file

@ -395,7 +395,21 @@ static inline int xdr_stream_encode_item_absent(struct xdr_stream *xdr)
} }
/** /**
* xdr_stream_encode_bool - Encode a "not present" list item * xdr_encode_bool - Encode a boolean item
* @p: address in a buffer into which to encode
* @n: boolean value to encode
*
* Return value:
* Address of item following the encoded boolean
*/
static inline __be32 *xdr_encode_bool(__be32 *p, u32 n)
{
*p = n ? xdr_one : xdr_zero;
return p++;
}
/**
* xdr_stream_encode_bool - Encode a boolean item
* @xdr: pointer to xdr_stream * @xdr: pointer to xdr_stream
* @n: boolean value to encode * @n: boolean value to encode
* *
@ -410,7 +424,7 @@ static inline int xdr_stream_encode_bool(struct xdr_stream *xdr, __u32 n)
if (unlikely(!p)) if (unlikely(!p))
return -EMSGSIZE; return -EMSGSIZE;
*p = n ? xdr_one : xdr_zero; xdr_encode_bool(p, n);
return len; return len;
} }