Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

fs/nfs/nfs4client.c

+4 −12
Original line number Diff line number Diff line
@@ -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;



	error = nfs_init_server_rpcclient(server, &timeparms,

	return nfs_init_server_rpcclient(server, &timeparms,

					 data->selected_flavor);



error:

	/* Done */

	dprintk("<-- nfs4_init_server() = %d\n", error);

	return error;

}



/*