diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-20 02:29:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-20 13:26:43 -0400 |
| commit | f00f328fda1eeec575cd0f360da81b66bf4133a1 (patch) | |
| tree | 3e1ebdd933267f6c3b9dbcd70406d18df06cda7f /fs | |
| parent | b8dd7b9ab194d9ab322881f49fde42954757efae (diff) | |
[PATCH] xdr annotations: nfsd callback*
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Trond Myklebust <trond.myklebust@fys.uio.no>
Acked-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/nfs4callback.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index 324a278f2808..8497ed4862b2 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c | |||
| @@ -85,8 +85,8 @@ enum nfs_cb_opnum4 { | |||
| 85 | /* | 85 | /* |
| 86 | * Generic encode routines from fs/nfs/nfs4xdr.c | 86 | * Generic encode routines from fs/nfs/nfs4xdr.c |
| 87 | */ | 87 | */ |
| 88 | static inline u32 * | 88 | static inline __be32 * |
| 89 | xdr_writemem(u32 *p, const void *ptr, int nbytes) | 89 | xdr_writemem(__be32 *p, const void *ptr, int nbytes) |
| 90 | { | 90 | { |
| 91 | int tmp = XDR_QUADLEN(nbytes); | 91 | int tmp = XDR_QUADLEN(nbytes); |
| 92 | if (!tmp) | 92 | if (!tmp) |
| @@ -205,7 +205,7 @@ nfs_cb_stat_to_errno(int stat) | |||
| 205 | static int | 205 | static int |
| 206 | encode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr) | 206 | encode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr) |
| 207 | { | 207 | { |
| 208 | u32 * p; | 208 | __be32 * p; |
| 209 | 209 | ||
| 210 | RESERVE_SPACE(16); | 210 | RESERVE_SPACE(16); |
| 211 | WRITE32(0); /* tag length is always 0 */ | 211 | 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 | static int | 218 | static int |
| 219 | encode_cb_recall(struct xdr_stream *xdr, struct nfs4_cb_recall *cb_rec) | 219 | encode_cb_recall(struct xdr_stream *xdr, struct nfs4_cb_recall *cb_rec) |
| 220 | { | 220 | { |
| 221 | u32 *p; | 221 | __be32 *p; |
| 222 | int len = cb_rec->cbr_fhlen; | 222 | int len = cb_rec->cbr_fhlen; |
| 223 | 223 | ||
| 224 | RESERVE_SPACE(12+sizeof(cb_rec->cbr_stateid) + len); | 224 | 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 | } | 231 | } |
| 232 | 232 | ||
| 233 | static int | 233 | static int |
| 234 | nfs4_xdr_enc_cb_null(struct rpc_rqst *req, u32 *p) | 234 | nfs4_xdr_enc_cb_null(struct rpc_rqst *req, __be32 *p) |
| 235 | { | 235 | { |
| 236 | struct xdr_stream xdrs, *xdr = &xdrs; | 236 | struct xdr_stream xdrs, *xdr = &xdrs; |
| 237 | 237 | ||
| @@ -241,7 +241,7 @@ nfs4_xdr_enc_cb_null(struct rpc_rqst *req, u32 *p) | |||
| 241 | } | 241 | } |
| 242 | 242 | ||
| 243 | static int | 243 | static int |
| 244 | nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, u32 *p, struct nfs4_cb_recall *args) | 244 | nfs4_xdr_enc_cb_recall(struct rpc_rqst *req, __be32 *p, struct nfs4_cb_recall *args) |
| 245 | { | 245 | { |
| 246 | struct xdr_stream xdr; | 246 | struct xdr_stream xdr; |
| 247 | struct nfs4_cb_compound_hdr hdr = { | 247 | 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 | 257 | ||
| 258 | static int | 258 | static int |
| 259 | decode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr){ | 259 | decode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr){ |
| 260 | u32 *p; | 260 | __be32 *p; |
| 261 | 261 | ||
| 262 | READ_BUF(8); | 262 | READ_BUF(8); |
| 263 | READ32(hdr->status); | 263 | READ32(hdr->status); |
| @@ -272,7 +272,7 @@ decode_cb_compound_hdr(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr) | |||
| 272 | static int | 272 | static int |
| 273 | decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected) | 273 | decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected) |
| 274 | { | 274 | { |
| 275 | u32 *p; | 275 | __be32 *p; |
| 276 | u32 op; | 276 | u32 op; |
| 277 | int32_t nfserr; | 277 | int32_t nfserr; |
| 278 | 278 | ||
| @@ -291,13 +291,13 @@ decode_cb_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected) | |||
| 291 | } | 291 | } |
| 292 | 292 | ||
| 293 | static int | 293 | static int |
| 294 | nfs4_xdr_dec_cb_null(struct rpc_rqst *req, u32 *p) | 294 | nfs4_xdr_dec_cb_null(struct rpc_rqst *req, __be32 *p) |
| 295 | { | 295 | { |
| 296 | return 0; | 296 | return 0; |
| 297 | } | 297 | } |
| 298 | 298 | ||
| 299 | static int | 299 | static int |
| 300 | nfs4_xdr_dec_cb_recall(struct rpc_rqst *rqstp, u32 *p) | 300 | nfs4_xdr_dec_cb_recall(struct rpc_rqst *rqstp, __be32 *p) |
| 301 | { | 301 | { |
| 302 | struct xdr_stream xdr; | 302 | struct xdr_stream xdr; |
| 303 | struct nfs4_cb_compound_hdr hdr; | 303 | struct nfs4_cb_compound_hdr hdr; |
