Commit 98866b5a authored by Benny Halevy's avatar Benny Halevy Committed by Trond Myklebust
Browse files

sunrpc: ntoh -> be*_to_cpu 



ntohl is already defined as be32_to_cpu.
be64_to_cpu has architecture specific optimized implementations.

Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 9f162d2a

include/linux/sunrpc/xdr.h

+2 −3
Original line number Diff line number Diff line
@@ -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;

}



/*

net/sunrpc/xdr.c

+3 −3
Original line number Diff line number Diff line
@@ -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;
@@ -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);