diff options
| author | Andy Adamson <andros@netapp.com> | 2010-01-22 12:03:08 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-02-10 08:31:01 -0500 |
| commit | 9733f0d9289cbcac4fa03db0cb5aec1ab01c6bc9 (patch) | |
| tree | 60cd0b76a80b71002f630cf993390228c0f9ab75 /fs/nfs/callback_xdr.c | |
| parent | 41f54a55480c752d9419cac5e647785cb794142e (diff) | |
nfs41: cleanup callback code to use __be32 type
Signed-off-by: Andy Adamson <andros@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/callback_xdr.c')
| -rw-r--r-- | fs/nfs/callback_xdr.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c index 8e66e20b59fd..db30c0b398b5 100644 --- a/fs/nfs/callback_xdr.c +++ b/fs/nfs/callback_xdr.c | |||
| @@ -219,10 +219,10 @@ out: | |||
| 219 | 219 | ||
| 220 | #if defined(CONFIG_NFS_V4_1) | 220 | #if defined(CONFIG_NFS_V4_1) |
| 221 | 221 | ||
| 222 | static unsigned decode_sessionid(struct xdr_stream *xdr, | 222 | static __be32 decode_sessionid(struct xdr_stream *xdr, |
| 223 | struct nfs4_sessionid *sid) | 223 | struct nfs4_sessionid *sid) |
| 224 | { | 224 | { |
| 225 | uint32_t *p; | 225 | __be32 *p; |
| 226 | int len = NFS4_MAX_SESSIONID_LEN; | 226 | int len = NFS4_MAX_SESSIONID_LEN; |
| 227 | 227 | ||
| 228 | p = read_buf(xdr, len); | 228 | p = read_buf(xdr, len); |
| @@ -233,12 +233,12 @@ static unsigned decode_sessionid(struct xdr_stream *xdr, | |||
| 233 | return 0; | 233 | return 0; |
| 234 | } | 234 | } |
| 235 | 235 | ||
| 236 | static unsigned decode_rc_list(struct xdr_stream *xdr, | 236 | static __be32 decode_rc_list(struct xdr_stream *xdr, |
| 237 | struct referring_call_list *rc_list) | 237 | struct referring_call_list *rc_list) |
| 238 | { | 238 | { |
| 239 | uint32_t *p; | 239 | __be32 *p; |
| 240 | int i; | 240 | int i; |
| 241 | unsigned status; | 241 | __be32 status; |
| 242 | 242 | ||
| 243 | status = decode_sessionid(xdr, &rc_list->rcl_sessionid); | 243 | status = decode_sessionid(xdr, &rc_list->rcl_sessionid); |
| 244 | if (status) | 244 | if (status) |
| @@ -271,13 +271,13 @@ out: | |||
| 271 | return status; | 271 | return status; |
| 272 | } | 272 | } |
| 273 | 273 | ||
| 274 | static unsigned decode_cb_sequence_args(struct svc_rqst *rqstp, | 274 | static __be32 decode_cb_sequence_args(struct svc_rqst *rqstp, |
| 275 | struct xdr_stream *xdr, | 275 | struct xdr_stream *xdr, |
| 276 | struct cb_sequenceargs *args) | 276 | struct cb_sequenceargs *args) |
| 277 | { | 277 | { |
| 278 | uint32_t *p; | 278 | __be32 *p; |
| 279 | int i; | 279 | int i; |
| 280 | unsigned status; | 280 | __be32 status; |
| 281 | 281 | ||
| 282 | status = decode_sessionid(xdr, &args->csa_sessionid); | 282 | status = decode_sessionid(xdr, &args->csa_sessionid); |
| 283 | if (status) | 283 | if (status) |
| @@ -331,11 +331,11 @@ out_free: | |||
| 331 | goto out; | 331 | goto out; |
| 332 | } | 332 | } |
| 333 | 333 | ||
| 334 | static unsigned decode_recallany_args(struct svc_rqst *rqstp, | 334 | static __be32 decode_recallany_args(struct svc_rqst *rqstp, |
| 335 | struct xdr_stream *xdr, | 335 | struct xdr_stream *xdr, |
| 336 | struct cb_recallanyargs *args) | 336 | struct cb_recallanyargs *args) |
| 337 | { | 337 | { |
| 338 | uint32_t *p; | 338 | __be32 *p; |
| 339 | 339 | ||
| 340 | args->craa_addr = svc_addr(rqstp); | 340 | args->craa_addr = svc_addr(rqstp); |
| 341 | p = read_buf(xdr, 4); | 341 | p = read_buf(xdr, 4); |
| @@ -350,7 +350,7 @@ static unsigned decode_recallany_args(struct svc_rqst *rqstp, | |||
| 350 | return 0; | 350 | return 0; |
| 351 | } | 351 | } |
| 352 | 352 | ||
| 353 | static unsigned decode_recallslot_args(struct svc_rqst *rqstp, | 353 | static __be32 decode_recallslot_args(struct svc_rqst *rqstp, |
| 354 | struct xdr_stream *xdr, | 354 | struct xdr_stream *xdr, |
| 355 | struct cb_recallslotargs *args) | 355 | struct cb_recallslotargs *args) |
| 356 | { | 356 | { |
| @@ -517,10 +517,10 @@ out: | |||
| 517 | 517 | ||
| 518 | #if defined(CONFIG_NFS_V4_1) | 518 | #if defined(CONFIG_NFS_V4_1) |
| 519 | 519 | ||
| 520 | static unsigned encode_sessionid(struct xdr_stream *xdr, | 520 | static __be32 encode_sessionid(struct xdr_stream *xdr, |
| 521 | const struct nfs4_sessionid *sid) | 521 | const struct nfs4_sessionid *sid) |
| 522 | { | 522 | { |
| 523 | uint32_t *p; | 523 | __be32 *p; |
| 524 | int len = NFS4_MAX_SESSIONID_LEN; | 524 | int len = NFS4_MAX_SESSIONID_LEN; |
| 525 | 525 | ||
| 526 | p = xdr_reserve_space(xdr, len); | 526 | p = xdr_reserve_space(xdr, len); |
| @@ -531,11 +531,11 @@ static unsigned encode_sessionid(struct xdr_stream *xdr, | |||
| 531 | return 0; | 531 | return 0; |
| 532 | } | 532 | } |
| 533 | 533 | ||
| 534 | static unsigned encode_cb_sequence_res(struct svc_rqst *rqstp, | 534 | static __be32 encode_cb_sequence_res(struct svc_rqst *rqstp, |
| 535 | struct xdr_stream *xdr, | 535 | struct xdr_stream *xdr, |
| 536 | const struct cb_sequenceres *res) | 536 | const struct cb_sequenceres *res) |
| 537 | { | 537 | { |
| 538 | uint32_t *p; | 538 | __be32 *p; |
| 539 | unsigned status = res->csr_status; | 539 | unsigned status = res->csr_status; |
| 540 | 540 | ||
| 541 | if (unlikely(status != 0)) | 541 | if (unlikely(status != 0)) |
