aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/sunrpc/xdr.h
diff options
context:
space:
mode:
authorBenny Halevy <bhalevy@panasas.com>2009-09-23 14:36:38 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2009-09-23 14:36:38 -0400
commit97363c6a4f93a20380b4a9e11f35e27fed68a517 (patch)
tree12d4c58196f7975a2b70ea0be1833c96f51f6edd /include/linux/sunrpc/xdr.h
parent9423a08ad5773d0a7612d434700561dc8346b6d6 (diff)
downloadmrst-s0i3-test-97363c6a4f93a20380b4a9e11f35e27fed68a517.tar.gz
mrst-s0i3-test-97363c6a4f93a20380b4a9e11f35e27fed68a517.tar.xz
mrst-s0i3-test-97363c6a4f93a20380b4a9e11f35e27fed68a517.zip
sunrpc: xdr_xcode_hyper helpers cannot presume 64-bit alignment
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, 3 insertions, 2 deletions
diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
index 7da466ba4b0..f5cc0898bc5 100644
--- a/include/linux/sunrpc/xdr.h
+++ b/include/linux/sunrpc/xdr.h
@@ -11,6 +11,7 @@
#include <linux/uio.h>
#include <asm/byteorder.h>
+#include <asm/unaligned.h>
#include <linux/scatterlist.h>
/*
@@ -117,14 +118,14 @@ static inline __be32 *xdr_encode_array(__be32 *p, const void *s, unsigned int le
static inline __be32 *
xdr_encode_hyper(__be32 *p, __u64 val)
{
- *(__be64 *)p = cpu_to_be64(val);
+ put_unaligned_be64(val, p);
return p + 2;
}
static inline __be32 *
xdr_decode_hyper(__be32 *p, __u64 *valp)
{
- *valp = be64_to_cpup((__be64 *)p);
+ *valp = get_unaligned_be64(p);
return p + 2;
}