git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'nfs-for-5.1-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
[sfrench/cifs-2.6.git]
/
include
/
linux
/
sunrpc
/
xprt.h
diff --git
a/include/linux/sunrpc/xprt.h
b/include/linux/sunrpc/xprt.h
index ad7e910b119dff15bf09af1e614577e05499c9d3..3a391544299e8dc1c39f85cb4d81ff491391c7d5 100644
(file)
--- a/
include/linux/sunrpc/xprt.h
+++ b/
include/linux/sunrpc/xprt.h
@@
-196,8
+196,6
@@
struct rpc_xprt {
size_t max_payload; /* largest RPC payload size,
in bytes */
size_t max_payload; /* largest RPC payload size,
in bytes */
- unsigned int tsh_size; /* size of transport specific
- header */
struct rpc_wait_queue binding; /* requests waiting on rpcbind */
struct rpc_wait_queue sending; /* requests waiting to send */
struct rpc_wait_queue binding; /* requests waiting on rpcbind */
struct rpc_wait_queue sending; /* requests waiting to send */
@@
-362,11
+360,6
@@
struct rpc_xprt * xprt_alloc(struct net *net, size_t size,
unsigned int max_req);
void xprt_free(struct rpc_xprt *);
unsigned int max_req);
void xprt_free(struct rpc_xprt *);
-static inline __be32 *xprt_skip_transport_header(struct rpc_xprt *xprt, __be32 *p)
-{
- return p + xprt->tsh_size;
-}
-
static inline int
xprt_enable_swap(struct rpc_xprt *xprt)
{
static inline int
xprt_enable_swap(struct rpc_xprt *xprt)
{