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

Commit f00f328f authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] xdr annotations: nfsd callback* 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Acked-by: default avatarTrond Myklebust <trond.myklebust@fys.uio.no>
Acked-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b8dd7b9a

fs/nfsd/nfs4callback.c

+10 −10
Original line number Diff line number Diff line
@@ -85,8 +85,8 @@ enum nfs_cb_opnum4 { 
/*

* Generic encode routines from fs/nfs/nfs4xdr.c

*/

static inline u32 *

xdr_writemem(u32 *p, const void *ptr, int nbytes)

static inline __be32 *

xdr_writemem(__be32 *p, const void *ptr, int nbytes)

{

	int tmp = XDR_QUADLEN(nbytes);

	if (!tmp)
@@ -205,7 +205,7 @@ nfs_cb_stat_to_errno(int stat) 
static int

encode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr)

{

	u32 * p;

	__be32 * p;



	RESERVE_SPACE(16);

	WRITE32(0);            /* tag length is always 0 */
@@ -218,7 +218,7 @@ encode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr) 
static int

encode_cb_recall(struct xdr_stream *xdr, struct nfs4_cb_recall *cb_rec)

{

	u32 *p;

	__be32 *p;

	int len = cb_rec->cbr_fhlen;



	RESERVE_SPACE(12+sizeof(cb_rec->cbr_stateid) + len);
@@ -231,7 +231,7 @@ encode_cb_recall(struct xdr_stream *xdr, struct nfs4_cb_recall *cb_rec) 
}



static int

nfs4_xdr_enc_cb_null(struct rpc_rqst *req, u32 *p)

nfs4_xdr_enc_cb_null(struct rpc_rqst *req, __be32 *p)

{

	struct xdr_stream xdrs, *xdr = &xdrs;
@@ -241,7 +241,7 @@ nfs4_xdr_enc_cb_null(struct rpc_rqst *req, u32 *p) 
}



static int

nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, u32 *p, struct nfs4_cb_recall *args)

nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, __be32 *p, struct nfs4_cb_recall *args)

{

	struct xdr_stream xdr;

	struct nfs4_cb_compound_hdr hdr = {
@@ -257,7 +257,7 @@ nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, u32 *p, struct nfs4_cb_recall *args 


static int

decode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr){

        u32 *p;

        __be32 *p;



        READ_BUF(8);

        READ32(hdr->status);
@@ -272,7 +272,7 @@ decode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr) 
static int

decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected)

{

	u32 *p;

	__be32 *p;

	u32 op;

	int32_t nfserr;
@@ -291,13 +291,13 @@ decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected) 
}



static int

nfs4_xdr_dec_cb_null(struct rpc_rqst *req, u32 *p)

nfs4_xdr_dec_cb_null(struct rpc_rqst *req, __be32 *p)

{

	return 0;

}



static int

nfs4_xdr_dec_cb_recall(struct rpc_rqst *rqstp, u32 *p)

nfs4_xdr_dec_cb_recall(struct rpc_rqst *rqstp, __be32 *p)

{

	struct xdr_stream xdr;

	struct nfs4_cb_compound_hdr hdr;