UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

NFS: Clean up nfs4_init_server() 

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Anna Schumaker 2017-04-07 14:15:17 -04:00 committed by Trond Myklebust
parent 2dc42c0d60
commit 1073d9b49a
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/nfs/nfs4client.c
View File

@ -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,
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,
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;
error = nfs_init_server_rpcclient(server, &timeparms, return nfs_init_server_rpcclient(server, &timeparms,
data->selected_flavor); data->selected_flavor);
error:
/* Done */
dprintk("<-- nfs4_init_server() = %d\n", error);
return error;
} }
/* /*