diff options
-rw-r--r-- | include/linux/sunrpc/xprt.h | 10 | ||||
-rw-r--r-- | net/sunrpc/clnt.c | 2 | ||||
-rw-r--r-- | net/sunrpc/xprt.c | 2 | ||||
-rw-r--r-- | net/sunrpc/xprtsock.c | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h index 7b6b137eca97..6992ff02d737 100644 --- a/include/linux/sunrpc/xprt.h +++ b/include/linux/sunrpc/xprt.h | |||
@@ -200,7 +200,7 @@ struct rpc_xprt { | |||
200 | char * address_strings[RPC_DISPLAY_MAX]; | 200 | char * address_strings[RPC_DISPLAY_MAX]; |
201 | }; | 201 | }; |
202 | 202 | ||
203 | struct rpc_xprtsock_create { | 203 | struct xprt_create { |
204 | int proto; /* IPPROTO_UDP or IPPROTO_TCP */ | 204 | int proto; /* IPPROTO_UDP or IPPROTO_TCP */ |
205 | struct sockaddr * srcaddr; /* optional local address */ | 205 | struct sockaddr * srcaddr; /* optional local address */ |
206 | struct sockaddr * dstaddr; /* remote peer address */ | 206 | struct sockaddr * dstaddr; /* remote peer address */ |
@@ -212,7 +212,7 @@ struct xprt_class { | |||
212 | struct list_head list; | 212 | struct list_head list; |
213 | unsigned short family; | 213 | unsigned short family; |
214 | int protocol; | 214 | int protocol; |
215 | struct rpc_xprt * (*setup)(struct rpc_xprtsock_create *); | 215 | struct rpc_xprt * (*setup)(struct xprt_create *); |
216 | struct module *owner; | 216 | struct module *owner; |
217 | char name[32]; | 217 | char name[32]; |
218 | }; | 218 | }; |
@@ -225,7 +225,7 @@ void xprt_set_timeout(struct rpc_timeout *to, unsigned int retr, unsigned long | |||
225 | /* | 225 | /* |
226 | * Generic internal transport functions | 226 | * Generic internal transport functions |
227 | */ | 227 | */ |
228 | struct rpc_xprt * xprt_create_transport(struct rpc_xprtsock_create *args); | 228 | struct rpc_xprt *xprt_create_transport(struct xprt_create *args); |
229 | void xprt_connect(struct rpc_task *task); | 229 | void xprt_connect(struct rpc_task *task); |
230 | void xprt_reserve(struct rpc_task *task); | 230 | void xprt_reserve(struct rpc_task *task); |
231 | int xprt_reserve_xprt(struct rpc_task *task); | 231 | int xprt_reserve_xprt(struct rpc_task *task); |
@@ -265,8 +265,8 @@ void xprt_disconnect(struct rpc_xprt *xprt); | |||
265 | /* | 265 | /* |
266 | * Socket transport setup operations | 266 | * Socket transport setup operations |
267 | */ | 267 | */ |
268 | struct rpc_xprt * xs_setup_udp(struct rpc_xprtsock_create *args); | 268 | struct rpc_xprt *xs_setup_udp(struct xprt_create *args); |
269 | struct rpc_xprt * xs_setup_tcp(struct rpc_xprtsock_create *args); | 269 | struct rpc_xprt *xs_setup_tcp(struct xprt_create *args); |
270 | int init_socket_xprt(void); | 270 | int init_socket_xprt(void); |
271 | void cleanup_socket_xprt(void); | 271 | void cleanup_socket_xprt(void); |
272 | 272 | ||
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 19c129ed6467..e86958c61a20 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c | |||
@@ -240,7 +240,7 @@ struct rpc_clnt *rpc_create(struct rpc_create_args *args) | |||
240 | { | 240 | { |
241 | struct rpc_xprt *xprt; | 241 | struct rpc_xprt *xprt; |
242 | struct rpc_clnt *clnt; | 242 | struct rpc_clnt *clnt; |
243 | struct rpc_xprtsock_create xprtargs = { | 243 | struct xprt_create xprtargs = { |
244 | .proto = args->protocol, | 244 | .proto = args->protocol, |
245 | .srcaddr = args->saddress, | 245 | .srcaddr = args->saddress, |
246 | .dstaddr = args->address, | 246 | .dstaddr = args->address, |
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index 7f8c60b84396..473b48ff4523 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c | |||
@@ -979,7 +979,7 @@ void xprt_set_timeout(struct rpc_timeout *to, unsigned int retr, unsigned long i | |||
979 | * @args: rpc transport creation arguments | 979 | * @args: rpc transport creation arguments |
980 | * | 980 | * |
981 | */ | 981 | */ |
982 | struct rpc_xprt *xprt_create_transport(struct rpc_xprtsock_create *args) | 982 | struct rpc_xprt *xprt_create_transport(struct xprt_create *args) |
983 | { | 983 | { |
984 | struct rpc_xprt *xprt; | 984 | struct rpc_xprt *xprt; |
985 | struct rpc_rqst *req; | 985 | struct rpc_rqst *req; |
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 3bc9c921c82f..4f1a57b28a49 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c | |||
@@ -1784,7 +1784,7 @@ static struct rpc_xprt_ops xs_tcp_ops = { | |||
1784 | .print_stats = xs_tcp_print_stats, | 1784 | .print_stats = xs_tcp_print_stats, |
1785 | }; | 1785 | }; |
1786 | 1786 | ||
1787 | static struct rpc_xprt *xs_setup_xprt(struct rpc_xprtsock_create *args, | 1787 | static struct rpc_xprt *xs_setup_xprt(struct xprt_create *args, |
1788 | unsigned int slot_table_size) | 1788 | unsigned int slot_table_size) |
1789 | { | 1789 | { |
1790 | struct rpc_xprt *xprt; | 1790 | struct rpc_xprt *xprt; |
@@ -1826,7 +1826,7 @@ static struct rpc_xprt *xs_setup_xprt(struct rpc_xprtsock_create *args, | |||
1826 | * @args: rpc transport creation arguments | 1826 | * @args: rpc transport creation arguments |
1827 | * | 1827 | * |
1828 | */ | 1828 | */ |
1829 | struct rpc_xprt *xs_setup_udp(struct rpc_xprtsock_create *args) | 1829 | struct rpc_xprt *xs_setup_udp(struct xprt_create *args) |
1830 | { | 1830 | { |
1831 | struct sockaddr *addr = args->dstaddr; | 1831 | struct sockaddr *addr = args->dstaddr; |
1832 | struct rpc_xprt *xprt; | 1832 | struct rpc_xprt *xprt; |
@@ -1892,7 +1892,7 @@ struct rpc_xprt *xs_setup_udp(struct rpc_xprtsock_create *args) | |||
1892 | * @args: rpc transport creation arguments | 1892 | * @args: rpc transport creation arguments |
1893 | * | 1893 | * |
1894 | */ | 1894 | */ |
1895 | struct rpc_xprt *xs_setup_tcp(struct rpc_xprtsock_create *args) | 1895 | struct rpc_xprt *xs_setup_tcp(struct xprt_create *args) |
1896 | { | 1896 | { |
1897 | struct sockaddr *addr = args->dstaddr; | 1897 | struct sockaddr *addr = args->dstaddr; |
1898 | struct rpc_xprt *xprt; | 1898 | struct rpc_xprt *xprt; |