提交 f00f328f 编写于 作者: A Al Viro 提交者: Linus Torvalds

[PATCH] xdr annotations: nfsd callback*

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Acked-by: NTrond Myklebust <trond.myklebust@fys.uio.no>
Acked-by: NNeil Brown <neilb@suse.de>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 b8dd7b9a
...@@ -85,8 +85,8 @@ enum nfs_cb_opnum4 { ...@@ -85,8 +85,8 @@ enum nfs_cb_opnum4 {
/* /*
* Generic encode routines from fs/nfs/nfs4xdr.c * Generic encode routines from fs/nfs/nfs4xdr.c
*/ */
static inline u32 * static inline __be32 *
xdr_writemem(u32 *p, const void *ptr, int nbytes) xdr_writemem(__be32 *p, const void *ptr, int nbytes)
{ {
int tmp = XDR_QUADLEN(nbytes); int tmp = XDR_QUADLEN(nbytes);
if (!tmp) if (!tmp)
...@@ -205,7 +205,7 @@ nfs_cb_stat_to_errno(int stat) ...@@ -205,7 +205,7 @@ nfs_cb_stat_to_errno(int stat)
static int static int
encode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr) encode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr)
{ {
u32 * p; __be32 * p;
RESERVE_SPACE(16); RESERVE_SPACE(16);
WRITE32(0); /* tag length is always 0 */ 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) ...@@ -218,7 +218,7 @@ encode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr)
static int static int
encode_cb_recall(struct xdr_stream *xdr, struct nfs4_cb_recall *cb_rec) encode_cb_recall(struct xdr_stream *xdr, struct nfs4_cb_recall *cb_rec)
{ {
u32 *p; __be32 *p;
int len = cb_rec->cbr_fhlen; int len = cb_rec->cbr_fhlen;
RESERVE_SPACE(12+sizeof(cb_rec->cbr_stateid) + len); 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) ...@@ -231,7 +231,7 @@ encode_cb_recall(struct xdr_stream *xdr, struct nfs4_cb_recall *cb_rec)
} }
static int 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; struct xdr_stream xdrs, *xdr = &xdrs;
...@@ -241,7 +241,7 @@ nfs4_xdr_enc_cb_null(struct rpc_rqst *req, u32 *p) ...@@ -241,7 +241,7 @@ nfs4_xdr_enc_cb_null(struct rpc_rqst *req, u32 *p)
} }
static int 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 xdr_stream xdr;
struct nfs4_cb_compound_hdr hdr = { 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 ...@@ -257,7 +257,7 @@ nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, u32 *p, struct nfs4_cb_recall *args
static int static int
decode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr){ decode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr){
u32 *p; __be32 *p;
READ_BUF(8); READ_BUF(8);
READ32(hdr->status); READ32(hdr->status);
...@@ -272,7 +272,7 @@ decode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr) ...@@ -272,7 +272,7 @@ decode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr)
static int static int
decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected) decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected)
{ {
u32 *p; __be32 *p;
u32 op; u32 op;
int32_t nfserr; int32_t nfserr;
...@@ -291,13 +291,13 @@ decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected) ...@@ -291,13 +291,13 @@ decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected)
} }
static int 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; return 0;
} }
static int 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 xdr_stream xdr;
struct nfs4_cb_compound_hdr hdr; struct nfs4_cb_compound_hdr hdr;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册