aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/sunrpc/xdr.h
diff options
context:
space:
mode:
authorBenny Halevy <bhalevy@panasas.com>2009-08-14 17:18:49 +0300
committerTrond Myklebust <Trond.Myklebust@netapp.com>2009-08-14 13:12:52 -0400
commit98866b5abe1513cdacc011874ca045d40002eccd (patch)
treed6bddb53c9df2fb167b69561f9fd68dfadc65066 /include/linux/sunrpc/xdr.h
parent9f162d2a810b4db48f7b8d7e734d0932c81ec2a1 (diff)
downloadmrst-s0i3-test-98866b5abe1513cdacc011874ca045d40002eccd.tar.gz
mrst-s0i3-test-98866b5abe1513cdacc011874ca045d40002eccd.tar.xz
mrst-s0i3-test-98866b5abe1513cdacc011874ca045d40002eccd.zip
sunrpc: ntoh -> be*_to_cpu
ntohl is already defined as be32_to_cpu. be64_to_cpu has architecture specific optimized implementations. Signed-off-by: Benny Halevy <bhalevy@panasas.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'include/linux/sunrpc/xdr.h')
-rw-r--r--include/linux/sunrpc/xdr.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
index f94bbdc75c4..7da466ba4b0 100644
--- a/include/linux/sunrpc/xdr.h
+++ b/include/linux/sunrpc/xdr.h
@@ -124,9 +124,8 @@ xdr_encode_hyper(__be32 *p, __u64 val)
static inline __be32 *
xdr_decode_hyper(__be32 *p, __u64 *valp)
{
- *valp = ((__u64) ntohl(*p++)) << 32;
- *valp |= ntohl(*p++);
- return p;
+ *valp = be64_to_cpup((__be64 *)p);
+ return p + 2;
}
/*