diff options
| author |   Trond Myklebust <trond.myklebust@hammerspace.com> | 2019-06-11 16:53:33 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@hammerspace.com> | 2019-07-06 14:54:52 -0400 |
| commit | c98ebe2937404d8e6e028ac9cadcf870a6faccc2 (patch) | |
| tree | e2252a36a3efb93b8cecf95a75594696a9dd4169 /fs/nfs/client.c | |
| parent | Merge branch 'containers' (diff) | |
| parent | SUNRPC: Remove warning in debugfs.c when compiling with W=1 (diff) | |
| download | linux-dev-c98ebe2937404d8e6e028ac9cadcf870a6faccc2.tar.xz linux-dev-c98ebe2937404d8e6e028ac9cadcf870a6faccc2.zip | |
Merge branch 'multipath_tcp'
Diffstat (limited to 'fs/nfs/client.c')
| -rw-r--r-- | fs/nfs/client.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 6e7aeb543f6a..e4fa0a5fd183 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -176,6 +176,7 @@ struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_init) clp->cl_rpcclient = ERR_PTR(-EINVAL); clp->cl_proto = cl_init->proto; + clp->cl_nconnect = cl_init->nconnect; clp->cl_net = get_net(cl_init->net); clp->cl_principal = "*"; @@ -494,6 +495,7 @@ int nfs_create_rpc_client(struct nfs_client *clp, struct rpc_create_args args = { .net = clp->cl_net, .protocol = clp->cl_proto, + .nconnect = clp->cl_nconnect, .address = (struct sockaddr *)&clp->cl_addr, .addrsize = clp->cl_addrlen, .timeout = cl_init->timeparms, @@ -659,6 +661,7 @@ static int nfs_init_server(struct nfs_server *server, .net = data->net, .timeparms = &timeparms, .cred = server->cred, + .nconnect = data->nfs_server.nconnect, }; struct nfs_client *clp; int error; |