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

Commit 49c36fcc authored by \"Talpey, Thomas\'s avatar \"Talpey, Thomas\ Committed by Trond Myklebust
Browse files

SUNRPC: rearrange RPC sockets definitions 



To prepare for including non-sockets-based RPC transports, move the
sockets-dependent definitions into their own file.

Signed-off-by: default avatarTom Talpey <tmt@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 3c341b0b

include/linux/sunrpc/xprt.h

+0 −22
Original line number Diff line number Diff line
@@ -19,24 +19,10 @@ 


#ifdef __KERNEL__



extern unsigned int xprt_udp_slot_table_entries;

extern unsigned int xprt_tcp_slot_table_entries;



#define RPC_MIN_SLOT_TABLE	(2U)

#define RPC_DEF_SLOT_TABLE	(16U)

#define RPC_MAX_SLOT_TABLE	(128U)



/*

 * Parameters for choosing a free port

 */

extern unsigned int xprt_min_resvport;

extern unsigned int xprt_max_resvport;



#define RPC_MIN_RESVPORT	(1U)

#define RPC_MAX_RESVPORT	(65535U)

#define RPC_DEF_MIN_RESVPORT	(665U)

#define RPC_DEF_MAX_RESVPORT	(1023U)



/*

 * This describes a timeout strategy

 */
@@ -262,14 +248,6 @@ void xprt_complete_rqst(struct rpc_task *task, int copied); 
void			xprt_release_rqst_cong(struct rpc_task *task);

void			xprt_disconnect(struct rpc_xprt *xprt);



/*

 * Socket transport setup operations

 */

struct rpc_xprt		*xs_setup_udp(struct xprt_create *args);

struct rpc_xprt		*xs_setup_tcp(struct xprt_create *args);

int			init_socket_xprt(void);

void			cleanup_socket_xprt(void);



/*

 * Reserved bit positions in xprt->state

 */

include/linux/sunrpc/xprtsock.h

0 → 100644
+40 −0
Original line number Diff line number Diff line 
/*

 *  linux/include/linux/sunrpc/xprtsock.h

 *

 *  Declarations for the RPC transport socket provider.

 */



#ifndef _LINUX_SUNRPC_XPRTSOCK_H

#define _LINUX_SUNRPC_XPRTSOCK_H



#ifdef __KERNEL__



/*

 * Socket transport setup operations

 */

struct rpc_xprt *xs_setup_udp(struct xprt_create *args);

struct rpc_xprt *xs_setup_tcp(struct xprt_create *args);



int		init_socket_xprt(void);

void		cleanup_socket_xprt(void);



/*

 * RPC slot table sizes for UDP, TCP transports

 */

extern unsigned int xprt_udp_slot_table_entries;

extern unsigned int xprt_tcp_slot_table_entries;



/*

 * Parameters for choosing a free port

 */

extern unsigned int xprt_min_resvport;

extern unsigned int xprt_max_resvport;



#define RPC_MIN_RESVPORT	(1U)

#define RPC_MAX_RESVPORT	(65535U)

#define RPC_DEF_MIN_RESVPORT	(665U)

#define RPC_DEF_MAX_RESVPORT	(1023U)



#endif /* __KERNEL__ */



#endif /* _LINUX_SUNRPC_XPRTSOCK_H */

net/sunrpc/sunrpc_syms.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <linux/sunrpc/auth.h>

#include <linux/workqueue.h>

#include <linux/sunrpc/rpc_pipe_fs.h>



#include <linux/sunrpc/xprtsock.h>



/* RPC scheduler */

EXPORT_SYMBOL(rpc_execute);

net/sunrpc/xprtsock.c

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/tcp.h>

#include <linux/sunrpc/clnt.h>

#include <linux/sunrpc/sched.h>

#include <linux/sunrpc/xprtsock.h>

#include <linux/file.h>



#include <net/sock.h>