Merge branch 'nfsv4_xdr_cleanups-for-2.6.32' into nfs-for-2.6.32

Conflicts:
	fs/nfs/nfs4xdr.c

1 files changed, 6 insertions, 6 deletions

diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index 406e26de584e..8bd690c48b69 100644
--- a/net/sunrpc/xdr.c
+++ b/net/sunrpc/xdr.c
@@ -24,7 +24,7 @@ xdr_encode_netobj(__be32 *p, const struct xdr_netobj *obj)
         unsigned int    quadlen = XDR_QUADLEN(obj->len);
 
         p[quadlen] = 0;         /* zero trailing bytes */
-        *p++ = htonl(obj->len);
+        *p++ = cpu_to_be32(obj->len);
         memcpy(p, obj->data, obj->len);
         return p + XDR_QUADLEN(obj->len);
 }
@@ -35,7 +35,7 @@ xdr_decode_netobj(__be32 *p, struct xdr_netobj *obj)
 {
         unsigned int    len;
 
-        if ((len = ntohl(*p++)) > XDR_MAX_NETOBJ)
+        if ((len = be32_to_cpu(*p++)) > XDR_MAX_NETOBJ)
                 return NULL;
         obj->len  = len;
         obj->data = (u8 *) p;
@@ -83,7 +83,7 @@ EXPORT_SYMBOL_GPL(xdr_encode_opaque_fixed);
  */
 __be32 *xdr_encode_opaque(__be32 *p, const void *ptr, unsigned int nbytes)
 {
-        *p++ = htonl(nbytes);
+        *p++ = cpu_to_be32(nbytes);
         return xdr_encode_opaque_fixed(p, ptr, nbytes);
 }
 EXPORT_SYMBOL_GPL(xdr_encode_opaque);
@@ -101,7 +101,7 @@ xdr_decode_string_inplace(__be32 *p, char **sp,
 {
         u32 len;
 
-        len = ntohl(*p++);
+        len = be32_to_cpu(*p++);
         if (len > maxlen)
                 return NULL;
         *lenp = len;
@@ -771,7 +771,7 @@ xdr_decode_word(struct xdr_buf *buf, unsigned int base, u32 *obj)
         status = read_bytes_from_xdr_buf(buf, base, &raw, sizeof(*obj));
         if (status)
                 return status;
-        *obj = ntohl(raw);
+        *obj = be32_to_cpu(raw);
         return 0;
 }
 EXPORT_SYMBOL_GPL(xdr_decode_word);
@@ -779,7 +779,7 @@ EXPORT_SYMBOL_GPL(xdr_decode_word);
 int
 xdr_encode_word(struct xdr_buf *buf, unsigned int base, u32 obj)
 {
-        __be32  raw = htonl(obj);
+        __be32  raw = cpu_to_be32(obj);
 
         return write_bytes_to_xdr_buf(buf, base, &raw, sizeof(obj));
 }