android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sunrpc: hton -> cpu_to_be*

Browse Source 
htonl is already defined as cpu_to_be32.
cpu_to_be64 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:44 +03:00 committed by Trond Myklebust
parent 64f1607ffb
commit 9f162d2a81
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

@ -117,9 +117,8 @@ static inline __be32 *xdr_encode_array(__be32 *p, const void *s, unsigned int le
static inline __be32 * static inline __be32 *
xdr_encode_hyper(__be32 *p, __u64 val) xdr_encode_hyper(__be32 *p, __u64 val)
{ {
*p++ = htonl(val >> 32); *(__be64 *)p = cpu_to_be64(val);
*p++ = htonl(val & 0xFFFFFFFF); return p + 2;
return p;
} }
static inline __be32 * static inline __be32 *

6
net/sunrpc/xdr.c
View File

@ -24,7 +24,7 @@ xdr_encode_netobj(__be32 *p, const struct xdr_netobj *obj)
unsigned int quadlen = XDR_QUADLEN(obj->len); unsigned int quadlen = XDR_QUADLEN(obj->len);
p[quadlen] = 0; /* zero trailing bytes */ p[quadlen] = 0; /* zero trailing bytes */
*p++ = htonl(obj->len); *p++ = cpu_to_be32(obj->len);
memcpy(p, obj->data, obj->len); memcpy(p, obj->data, obj->len);
return p + XDR_QUADLEN(obj->len); return p + XDR_QUADLEN(obj->len);
} }
@ -83,7 +83,7 @@ EXPORT_SYMBOL_GPL(xdr_encode_opaque_fixed);
*/ */
__be32 *xdr_encode_opaque(__be32 *p, const void *ptr, unsigned int nbytes) __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); return xdr_encode_opaque_fixed(p, ptr, nbytes);
} }
EXPORT_SYMBOL_GPL(xdr_encode_opaque); EXPORT_SYMBOL_GPL(xdr_encode_opaque);
@ -779,7 +779,7 @@ EXPORT_SYMBOL_GPL(xdr_decode_word);
int int
xdr_encode_word(struct xdr_buf *buf, unsigned int base, u32 obj) 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)); return write_bytes_to_xdr_buf(buf, base, &raw, sizeof(obj));
} }