Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1502c81b authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nfsd: fix encoder callback prototypes 



Declare the p_encode callbacks with the proper prototype instead of
casting to kxdreproc_t and losing all type safety.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJeff Layton <jlayton@redhat.com>
parent 0096d39b

fs/nfsd/nfs4callback.c

+8 −5
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ static int decode_cb_sequence4res(struct xdr_stream *xdr, 
 * NB: Without this zero space reservation, callbacks over krb5p fail

 */

static void nfs4_xdr_enc_cb_null(struct rpc_rqst *req, struct xdr_stream *xdr,

				 void *__unused)

				 const void *__unused)

{

	xdr_reserve_space(xdr, 0);

}
@@ -477,8 +477,9 @@ static void nfs4_xdr_enc_cb_null(struct rpc_rqst *req, struct xdr_stream *xdr, 
 * 20.2. Operation 4: CB_RECALL - Recall a Delegation

 */

static void nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, struct xdr_stream *xdr,

				   const struct nfsd4_callback *cb)

				   const void *data)

{

	const struct nfsd4_callback *cb = data;

	const struct nfs4_delegation *dp = cb_to_delegation(cb);

	struct nfs4_cb_compound_hdr hdr = {

		.ident = cb->cb_clp->cl_cb_ident,
@@ -585,8 +586,9 @@ static void encode_cb_layout4args(struct xdr_stream *xdr, 


static void nfs4_xdr_enc_cb_layout(struct rpc_rqst *req,

				   struct xdr_stream *xdr,

				   const struct nfsd4_callback *cb)

				   const void *data)

{

	const struct nfsd4_callback *cb = data;

	const struct nfs4_layout_stateid *ls =

		container_of(cb, struct nfs4_layout_stateid, ls_recall);

	struct nfs4_cb_compound_hdr hdr = {
@@ -631,8 +633,9 @@ static void encode_stateowner(struct xdr_stream *xdr, struct nfs4_stateowner *so 


static void nfs4_xdr_enc_cb_notify_lock(struct rpc_rqst *req,

					struct xdr_stream *xdr,

					const struct nfsd4_callback *cb)

					const void *data)

{

	const struct nfsd4_callback *cb = data;

	const struct nfsd4_blocked_lock *nbl =

		container_of(cb, struct nfsd4_blocked_lock, nbl_cb);

	struct nfs4_lockowner *lo = (struct nfs4_lockowner *)nbl->nbl_lock.fl_owner;
@@ -682,7 +685,7 @@ static int nfs4_xdr_dec_cb_notify_lock(struct rpc_rqst *rqstp, 
#define PROC(proc, call, argtype, restype)				\

[NFSPROC4_CLNT_##proc] = {						\

	.p_proc    = NFSPROC4_CB_##call,				\

	.p_encode  = (kxdreproc_t)nfs4_xdr_enc_##argtype,		\

	.p_encode  = nfs4_xdr_enc_##argtype,		\

	.p_decode  = (kxdrdproc_t)nfs4_xdr_dec_##restype,		\

	.p_arglen  = NFS4_enc_##argtype##_sz,				\

	.p_replen  = NFS4_dec_##restype##_sz,				\