adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

sunrpc: ntoh -> be*_to_cpu

Browse source 
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>
This commit is contained in:
Benny Halevy 2009-08-14 17:18:49 +03:00 committed by Trond Myklebust
parent 9f162d2a81
commit 98866b5abe
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/linux/sunrpc/xdr.h
View file

@ -124,9 +124,8 @@ xdr_encode_hyper(__be32 *p, __u64 val)
static inline __be32 * static inline __be32 *
xdr_decode_hyper(__be32 *p, __u64 *valp) xdr_decode_hyper(__be32 *p, __u64 *valp)
{ {
*valp = ((__u64) ntohl(*p++)) << 32; *valp = be64_to_cpup((__be64 *)p);
*valp |= ntohl(*p++); return p + 2;
return p;
} }
/* /*

6
net/sunrpc/xdr.c
View file

@ -35,7 +35,7 @@ xdr_decode_netobj(__be32 *p, struct xdr_netobj *obj)
{ {
unsigned int len; unsigned int len;
if ((len = ntohl(*p++)) > XDR_MAX_NETOBJ) if ((len = be32_to_cpu(*p++)) > XDR_MAX_NETOBJ)
return NULL; return NULL;
obj->len = len; obj->len = len;
obj->data = (u8 *) p; obj->data = (u8 *) p;
@ -101,7 +101,7 @@ xdr_decode_string_inplace(__be32 *p, char **sp,
{ {
u32 len; u32 len;
len = ntohl(*p++); len = be32_to_cpu(*p++);
if (len > maxlen) if (len > maxlen)
return NULL; return NULL;
*lenp = len; *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)); status = read_bytes_from_xdr_buf(buf, base, &raw, sizeof(*obj));
if (status) if (status)
return status; return status;
*obj = ntohl(raw); *obj = be32_to_cpu(raw);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(xdr_decode_word); EXPORT_SYMBOL_GPL(xdr_decode_word);