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/xdr.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/xdr.c')
-rw-r--r-- | fs/lockd/xdr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/lockd/xdr.c b/fs/lockd/xdr.c index b7c949256e5a..34dae5d70738 100644 --- a/fs/lockd/xdr.c +++ b/fs/lockd/xdr.c | |||
@@ -361,7 +361,7 @@ nlmsvc_decode_res(struct svc_rqst *rqstp, __be32 *p, struct nlm_res *resp) | |||
361 | { | 361 | { |
362 | if (!(p = nlm_decode_cookie(p, &resp->cookie))) | 362 | if (!(p = nlm_decode_cookie(p, &resp->cookie))) |
363 | return 0; | 363 | return 0; |
364 | resp->status = ntohl(*p++); | 364 | resp->status = *p++; |
365 | return xdr_argsize_check(rqstp, p); | 365 | return xdr_argsize_check(rqstp, p); |
366 | } | 366 | } |
367 | 367 | ||
@@ -407,8 +407,8 @@ nlmclt_decode_testres(struct rpc_rqst *req, __be32 *p, struct nlm_res *resp) | |||
407 | { | 407 | { |
408 | if (!(p = nlm_decode_cookie(p, &resp->cookie))) | 408 | if (!(p = nlm_decode_cookie(p, &resp->cookie))) |
409 | return -EIO; | 409 | return -EIO; |
410 | resp->status = ntohl(*p++); | 410 | resp->status = *p++; |
411 | if (resp->status == NLM_LCK_DENIED) { | 411 | if (resp->status == nlm_lck_denied) { |
412 | struct file_lock *fl = &resp->lock.fl; | 412 | struct file_lock *fl = &resp->lock.fl; |
413 | u32 excl; | 413 | u32 excl; |
414 | s32 start, len, end; | 414 | s32 start, len, end; |
@@ -506,7 +506,7 @@ nlmclt_decode_res(struct rpc_rqst *req, __be32 *p, struct nlm_res *resp) | |||
506 | { | 506 | { |
507 | if (!(p = nlm_decode_cookie(p, &resp->cookie))) | 507 | if (!(p = nlm_decode_cookie(p, &resp->cookie))) |
508 | return -EIO; | 508 | return -EIO; |
509 | resp->status = ntohl(*p++); | 509 | resp->status = *p++; |
510 | return 0; | 510 | return 0; |
511 | } | 511 | } |
512 | 512 | ||