Commit c653ce3f authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by J. Bruce Fields

sunrpc: Add net to rpc_create_args

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 62832c03
...@@ -353,6 +353,7 @@ nlm_bind_host(struct nlm_host *host) ...@@ -353,6 +353,7 @@ nlm_bind_host(struct nlm_host *host)
.to_retries = 5U, .to_retries = 5U,
}; };
struct rpc_create_args args = { struct rpc_create_args args = {
.net = &init_net,
.protocol = host->h_proto, .protocol = host->h_proto,
.address = nlm_addr(host), .address = nlm_addr(host),
.addrsize = host->h_addrlen, .addrsize = host->h_addrlen,
......
...@@ -69,6 +69,7 @@ static struct rpc_clnt *nsm_create(void) ...@@ -69,6 +69,7 @@ static struct rpc_clnt *nsm_create(void)
.sin_addr.s_addr = htonl(INADDR_LOOPBACK), .sin_addr.s_addr = htonl(INADDR_LOOPBACK),
}; };
struct rpc_create_args args = { struct rpc_create_args args = {
.net = &init_net,
.protocol = XPRT_TRANSPORT_UDP, .protocol = XPRT_TRANSPORT_UDP,
.address = (struct sockaddr *)&sin, .address = (struct sockaddr *)&sin,
.addrsize = sizeof(sin), .addrsize = sizeof(sin),
......
...@@ -601,6 +601,7 @@ static int nfs_create_rpc_client(struct nfs_client *clp, ...@@ -601,6 +601,7 @@ static int nfs_create_rpc_client(struct nfs_client *clp,
{ {
struct rpc_clnt *clnt = NULL; struct rpc_clnt *clnt = NULL;
struct rpc_create_args args = { struct rpc_create_args args = {
.net = &init_net,
.protocol = clp->cl_proto, .protocol = clp->cl_proto,
.address = (struct sockaddr *)&clp->cl_addr, .address = (struct sockaddr *)&clp->cl_addr,
.addrsize = clp->cl_addrlen, .addrsize = clp->cl_addrlen,
......
...@@ -153,6 +153,7 @@ int nfs_mount(struct nfs_mount_request *info) ...@@ -153,6 +153,7 @@ int nfs_mount(struct nfs_mount_request *info)
.rpc_resp = &result, .rpc_resp = &result,
}; };
struct rpc_create_args args = { struct rpc_create_args args = {
.net = &init_net,
.protocol = info->protocol, .protocol = info->protocol,
.address = info->sap, .address = info->sap,
.addrsize = info->salen, .addrsize = info->salen,
...@@ -224,6 +225,7 @@ void nfs_umount(const struct nfs_mount_request *info) ...@@ -224,6 +225,7 @@ void nfs_umount(const struct nfs_mount_request *info)
.to_retries = 2, .to_retries = 2,
}; };
struct rpc_create_args args = { struct rpc_create_args args = {
.net = &init_net,
.protocol = IPPROTO_UDP, .protocol = IPPROTO_UDP,
.address = info->sap, .address = info->sap,
.addrsize = info->salen, .addrsize = info->salen,
......
...@@ -479,6 +479,7 @@ int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *cb) ...@@ -479,6 +479,7 @@ int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *cb)
.to_retries = 0, .to_retries = 0,
}; };
struct rpc_create_args args = { struct rpc_create_args args = {
.net = &init_net,
.protocol = XPRT_TRANSPORT_TCP, .protocol = XPRT_TRANSPORT_TCP,
.address = (struct sockaddr *) &cb->cb_addr, .address = (struct sockaddr *) &cb->cb_addr,
.addrsize = cb->cb_addrlen, .addrsize = cb->cb_addrlen,
......
...@@ -102,6 +102,7 @@ struct rpc_procinfo { ...@@ -102,6 +102,7 @@ struct rpc_procinfo {
#ifdef __KERNEL__ #ifdef __KERNEL__
struct rpc_create_args { struct rpc_create_args {
struct net *net;
int protocol; int protocol;
struct sockaddr *address; struct sockaddr *address;
size_t addrsize; size_t addrsize;
......
...@@ -177,6 +177,7 @@ static DEFINE_MUTEX(rpcb_create_local_mutex); ...@@ -177,6 +177,7 @@ static DEFINE_MUTEX(rpcb_create_local_mutex);
static int rpcb_create_local(void) static int rpcb_create_local(void)
{ {
struct rpc_create_args args = { struct rpc_create_args args = {
.net = &init_net,
.protocol = XPRT_TRANSPORT_TCP, .protocol = XPRT_TRANSPORT_TCP,
.address = (struct sockaddr *)&rpcb_inaddr_loopback, .address = (struct sockaddr *)&rpcb_inaddr_loopback,
.addrsize = sizeof(rpcb_inaddr_loopback), .addrsize = sizeof(rpcb_inaddr_loopback),
...@@ -228,6 +229,7 @@ static struct rpc_clnt *rpcb_create(char *hostname, struct sockaddr *srvaddr, ...@@ -228,6 +229,7 @@ static struct rpc_clnt *rpcb_create(char *hostname, struct sockaddr *srvaddr,
size_t salen, int proto, u32 version) size_t salen, int proto, u32 version)
{ {
struct rpc_create_args args = { struct rpc_create_args args = {
.net = &init_net,
.protocol = proto, .protocol = proto,
.address = srvaddr, .address = srvaddr,
.addrsize = salen, .addrsize = salen,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment