Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97363c6a authored by Benny Halevy's avatar Benny Halevy Committed by Trond Myklebust
Browse files

sunrpc: xdr_xcode_hyper helpers cannot presume 64-bit alignment 



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

include/linux/sunrpc/xdr.h

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

}