diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-12-13 03:35:03 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-13 12:05:52 -0500 |
commit | e8c5c045d790e7018c56f1a998a2d240b732ea3c (patch) | |
tree | d64de6d21d715d163244a1caeedd617955eaad5e /fs/lockd/xdr4.c | |
parent | 905f3ed62515f233fea09dc5ad68bbcff4903520 (diff) |
[PATCH] lockd endianness annotations
Annotated, all places switched to keeping status net-endian.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/lockd/xdr4.c')
-rw-r--r-- | fs/lockd/xdr4.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/lockd/xdr4.c b/fs/lockd/xdr4.c index f4c0b2b9f75a..a78240551219 100644 --- a/fs/lockd/xdr4.c +++ b/fs/lockd/xdr4.c | |||
@@ -367,7 +367,7 @@ nlm4svc_decode_res(struct svc_rqst *rqstp, __be32 *p, struct nlm_res *resp) | |||
367 | { | 367 | { |
368 | if (!(p = nlm4_decode_cookie(p, &resp->cookie))) | 368 | if (!(p = nlm4_decode_cookie(p, &resp->cookie))) |
369 | return 0; | 369 | return 0; |
370 | resp->status = ntohl(*p++); | 370 | resp->status = *p++; |
371 | return xdr_argsize_check(rqstp, p); | 371 | return xdr_argsize_check(rqstp, p); |
372 | } | 372 | } |
373 | 373 | ||
@@ -413,8 +413,8 @@ nlm4clt_decode_testres(struct rpc_rqst *req, __be32 *p, struct nlm_res *resp) | |||
413 | { | 413 | { |
414 | if (!(p = nlm4_decode_cookie(p, &resp->cookie))) | 414 | if (!(p = nlm4_decode_cookie(p, &resp->cookie))) |
415 | return -EIO; | 415 | return -EIO; |
416 | resp->status = ntohl(*p++); | 416 | resp->status = *p++; |
417 | if (resp->status == NLM_LCK_DENIED) { | 417 | if (resp->status == nlm_lck_denied) { |
418 | struct file_lock *fl = &resp->lock.fl; | 418 | struct file_lock *fl = &resp->lock.fl; |
419 | u32 excl; | 419 | u32 excl; |
420 | s64 start, end, len; | 420 | s64 start, end, len; |
@@ -512,7 +512,7 @@ nlm4clt_decode_res(struct rpc_rqst *req, __be32 *p, struct nlm_res *resp) | |||
512 | { | 512 | { |
513 | if (!(p = nlm4_decode_cookie(p, &resp->cookie))) | 513 | if (!(p = nlm4_decode_cookie(p, &resp->cookie))) |
514 | return -EIO; | 514 | return -EIO; |
515 | resp->status = ntohl(*p++); | 515 | resp->status = *p++; |
516 | return 0; | 516 | return 0; |
517 | } | 517 | } |
518 | 518 | ||