diff options
| author | Anna Schumaker <Anna.Schumaker@Netapp.com> | 2017-04-07 14:15:17 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2017-04-20 13:39:34 -0400 |
| commit | 1073d9b49ae4ede7682320168a209d46f70508bf (patch) | |
| tree | f38f06399c4756522465eac532fc5bf5928d9d28 /fs/nfs/nfs4client.c | |
| parent | 2dc42c0d60e0104f7cd8beee3871f953565392ff (diff) | |
| download | linux-1073d9b49ae4ede7682320168a209d46f70508bf.tar.bz2 | |
NFS: Clean up nfs4_init_server()
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/nfs4client.c')
| -rw-r--r-- | fs/nfs/nfs4client.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c index a380255e85ed..2e7fc76cbd4b 100644 --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c @@ -1025,8 +1025,6 @@ static int nfs4_init_server(struct nfs_server *server, struct rpc_timeout timeparms; int error; - dprintk("--> nfs4_init_server()\n"); - nfs_init_timeout_values(&timeparms, data->nfs_server.protocol, data->timeo, data->retrans); @@ -1054,7 +1052,7 @@ static int nfs4_init_server(struct nfs_server *server, data->minorversion, data->net); if (error < 0) - goto error; + return error; if (data->rsize) server->rsize = nfs_block_size(data->rsize, NULL); @@ -1065,16 +1063,10 @@ static int nfs4_init_server(struct nfs_server *server, server->acregmax = data->acregmax * HZ; server->acdirmin = data->acdirmin * HZ; server->acdirmax = data->acdirmax * HZ; + server->port = data->nfs_server.port; - server->port = data->nfs_server.port; - - error = nfs_init_server_rpcclient(server, &timeparms, - data->selected_flavor); - -error: - /* Done */ - dprintk("<-- nfs4_init_server() = %d\n", error); - return error; + return nfs_init_server_rpcclient(server, &timeparms, + data->selected_flavor); } /* |