lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SUNRPC: rename the rpc_xprtsock_create structure

Browse Source 
To prepare for including non-sockets-based RPC transports, change the
overly suggestive name of the transport creation arguments struct.

Signed-off-by: Tom Talpey <tmt@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
\"Talpey, Thomas\
2007-09-10 13:47:07 -04:00
committed by Trond Myklebust
parent bc25571e21
commit 3c341b0b92
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/linux/sunrpc/xprt.h
View File

@@ -200,7 +200,7 @@ struct rpc_xprt {
char * address_strings[RPC_DISPLAY_MAX]; char * address_strings[RPC_DISPLAY_MAX];
}; };
struct rpc_xprtsock_create { struct xprt_create {
int proto; /* IPPROTO_UDP or IPPROTO_TCP */ int proto; /* IPPROTO_UDP or IPPROTO_TCP */
struct sockaddr * srcaddr; /* optional local address */ struct sockaddr * srcaddr; /* optional local address */
struct sockaddr * dstaddr; /* remote peer address */ struct sockaddr * dstaddr; /* remote peer address */
@@ -212,7 +212,7 @@ struct xprt_class {
struct list_head list; struct list_head list;
unsigned short family; unsigned short family;
int protocol; int protocol;
struct rpc_xprt * (*setup)(struct rpc_xprtsock_create *); struct rpc_xprt * (*setup)(struct xprt_create *);
struct module *owner; struct module *owner;
char name[32]; char name[32];
}; };
@@ -225,7 +225,7 @@ void xprt_set_timeout(struct rpc_timeout *to, unsigned int retr, unsigned long
/* /*
* Generic internal transport functions * Generic internal transport functions
*/ */
struct rpc_xprt * xprt_create_transport(struct rpc_xprtsock_create *args); struct rpc_xprt *xprt_create_transport(struct xprt_create *args);
void xprt_connect(struct rpc_task *task); void xprt_connect(struct rpc_task *task);
void xprt_reserve(struct rpc_task *task); void xprt_reserve(struct rpc_task *task);
int xprt_reserve_xprt(struct rpc_task *task); int xprt_reserve_xprt(struct rpc_task *task);
@@ -265,8 +265,8 @@ void xprt_disconnect(struct rpc_xprt *xprt);
/* /*
* Socket transport setup operations * Socket transport setup operations
*/ */
struct rpc_xprt * xs_setup_udp(struct rpc_xprtsock_create *args); struct rpc_xprt *xs_setup_udp(struct xprt_create *args);
struct rpc_xprt * xs_setup_tcp(struct rpc_xprtsock_create *args); struct rpc_xprt *xs_setup_tcp(struct xprt_create *args);
int init_socket_xprt(void); int init_socket_xprt(void);
void cleanup_socket_xprt(void); void cleanup_socket_xprt(void);

2
net/sunrpc/clnt.c
View File

@@ -240,7 +240,7 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args)
{ {
struct rpc_xprt *xprt; struct rpc_xprt *xprt;
struct rpc_clnt *clnt; struct rpc_clnt *clnt;
struct rpc_xprtsock_create xprtargs = { struct xprt_create xprtargs = {
.proto = args->protocol, .proto = args->protocol,
.srcaddr = args->saddress, .srcaddr = args->saddress,
.dstaddr = args->address, .dstaddr = args->address,

2
net/sunrpc/xprt.c
View File

@@ -979,7 +979,7 @@ void xprt_set_timeout(struct rpc_timeout *to, unsigned int retr, unsigned long i
* @args: rpc transport creation arguments * @args: rpc transport creation arguments
* *
*/ */
struct rpc_xprt *xprt_create_transport(struct rpc_xprtsock_create *args) struct rpc_xprt *xprt_create_transport(struct xprt_create *args)
{ {
struct rpc_xprt *xprt; struct rpc_xprt *xprt;
struct rpc_rqst *req; struct rpc_rqst *req;

6
net/sunrpc/xprtsock.c
View File

@@ -1784,7 +1784,7 @@ static struct rpc_xprt_ops xs_tcp_ops = {
.print_stats = xs_tcp_print_stats, .print_stats = xs_tcp_print_stats,
}; };
static struct rpc_xprt *xs_setup_xprt(struct rpc_xprtsock_create *args, static struct rpc_xprt *xs_setup_xprt(struct xprt_create *args,
unsigned int slot_table_size) unsigned int slot_table_size)
{ {
struct rpc_xprt *xprt; struct rpc_xprt *xprt;
@@ -1826,7 +1826,7 @@ static struct rpc_xprt *xs_setup_xprt(struct rpc_xprtsock_create *args,
* @args: rpc transport creation arguments * @args: rpc transport creation arguments
* *
*/ */
struct rpc_xprt *xs_setup_udp(struct rpc_xprtsock_create *args) struct rpc_xprt *xs_setup_udp(struct xprt_create *args)
{ {
struct sockaddr *addr = args->dstaddr; struct sockaddr *addr = args->dstaddr;
struct rpc_xprt *xprt; struct rpc_xprt *xprt;
@@ -1892,7 +1892,7 @@ struct rpc_xprt *xs_setup_udp(struct rpc_xprtsock_create *args)
* @args: rpc transport creation arguments * @args: rpc transport creation arguments
* *
*/ */
struct rpc_xprt *xs_setup_tcp(struct rpc_xprtsock_create *args) struct rpc_xprt *xs_setup_tcp(struct xprt_create *args)
{ {
struct sockaddr *addr = args->dstaddr; struct sockaddr *addr = args->dstaddr;
struct rpc_xprt *xprt; struct rpc_xprt *xprt;