xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SUNRPC: Move definition of XDR_UNIT

Browse Source 
[ Upstream commit 81d217474326b25d7f14274b02fe3da1e85ad934 ]

Clean up: The unit of XDR alignment is defined by RFC 4506,
not as part of the RPC message header. Thus it belongs in
include/linux/sunrpc/xdr.h.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Chuck Lever
2020-11-27 17:37:02 -05:00
committed by Greg Kroah-Hartman
parent 97d254cba3
commit 22b19656ea
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/sunrpc/msg_prot.h
View File

@@ -10,9 +10,6 @@
#define RPC_VERSION 2 #define RPC_VERSION 2
/* size of an XDR encoding unit in bytes, i.e. 32bit */
#define XDR_UNIT (4)
/* spec defines authentication flavor as an unsigned 32 bit integer */ /* spec defines authentication flavor as an unsigned 32 bit integer */
typedef u32 rpc_authflavor_t; typedef u32 rpc_authflavor_t;

13
include/linux/sunrpc/xdr.h
View File

@@ -19,6 +19,13 @@
struct bio_vec; struct bio_vec;
struct rpc_rqst; struct rpc_rqst;
/*
* Size of an XDR encoding unit in bytes, i.e. 32 bits,
* as defined in Section 3 of RFC 4506. All encoded
* XDR data items are aligned on a boundary of 32 bits.
*/
#define XDR_UNIT sizeof(__be32)
/* /*
* Buffer adjustment * Buffer adjustment
*/ */
@@ -329,7 +336,7 @@ ssize_t xdr_stream_decode_string_dup(struct xdr_stream *xdr, char **str,
static inline size_t static inline size_t
xdr_align_size(size_t n) xdr_align_size(size_t n)
{ {
const size_t mask = sizeof(__u32) - 1; const size_t mask = XDR_UNIT - 1;
return (n + mask) & ~mask; return (n + mask) & ~mask;
} }
@@ -359,7 +366,7 @@ static inline size_t xdr_pad_size(size_t n)
*/ */
static inline ssize_t xdr_stream_encode_item_present(struct xdr_stream *xdr) static inline ssize_t xdr_stream_encode_item_present(struct xdr_stream *xdr)
{ {
const size_t len = sizeof(__be32); const size_t len = XDR_UNIT;
__be32 *p = xdr_reserve_space(xdr, len); __be32 *p = xdr_reserve_space(xdr, len);
if (unlikely(!p)) if (unlikely(!p))
@@ -378,7 +385,7 @@ static inline ssize_t xdr_stream_encode_item_present(struct xdr_stream *xdr)
*/ */
static inline int xdr_stream_encode_item_absent(struct xdr_stream *xdr) static inline int xdr_stream_encode_item_absent(struct xdr_stream *xdr)
{ {
const size_t len = sizeof(__be32); const size_t len = XDR_UNIT;
__be32 *p = xdr_reserve_space(xdr, len); __be32 *p = xdr_reserve_space(xdr, len);
if (unlikely(!p)) if (unlikely(!p))