Commit 1073d9b4 authored by Anna Schumaker's avatar Anna Schumaker Committed by Trond Myklebust

NFS: Clean up nfs4_init_server()

Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 2dc42c0d
...@@ -1025,8 +1025,6 @@ static int nfs4_init_server(struct nfs_server *server, ...@@ -1025,8 +1025,6 @@ static int nfs4_init_server(struct nfs_server *server,
struct rpc_timeout timeparms; struct rpc_timeout timeparms;
int error; int error;
dprintk("--> nfs4_init_server()\n");
nfs_init_timeout_values(&timeparms, data->nfs_server.protocol, nfs_init_timeout_values(&timeparms, data->nfs_server.protocol,
data->timeo, data->retrans); data->timeo, data->retrans);
...@@ -1054,7 +1052,7 @@ static int nfs4_init_server(struct nfs_server *server, ...@@ -1054,7 +1052,7 @@ static int nfs4_init_server(struct nfs_server *server,
data->minorversion, data->minorversion,
data->net); data->net);
if (error < 0) if (error < 0)
goto error; return error;
if (data->rsize) if (data->rsize)
server->rsize = nfs_block_size(data->rsize, NULL); server->rsize = nfs_block_size(data->rsize, NULL);
...@@ -1065,16 +1063,10 @@ static int nfs4_init_server(struct nfs_server *server, ...@@ -1065,16 +1063,10 @@ static int nfs4_init_server(struct nfs_server *server,
server->acregmax = data->acregmax * HZ; server->acregmax = data->acregmax * HZ;
server->acdirmin = data->acdirmin * HZ; server->acdirmin = data->acdirmin * HZ;
server->acdirmax = data->acdirmax * HZ; server->acdirmax = data->acdirmax * HZ;
server->port = data->nfs_server.port;
server->port = data->nfs_server.port; return nfs_init_server_rpcclient(server, &timeparms,
data->selected_flavor);
error = nfs_init_server_rpcclient(server, &timeparms,
data->selected_flavor);
error:
/* Done */
dprintk("<-- nfs4_init_server() = %d\n", error);
return error;
} }
/* /*
......
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