Commit 542fcc33 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

NFS: move nfs_server flag initialization 



Make it possible for the NFSv4 mount set up logic to pass mount option
flags down the stack to nfs_create_rpc_client().

This is immediately useful if we want NFS mount options to modulate
settings of the underlying RPC transport, but it may be useful at some
later point if other parts of the NFSv4 mount initialization logic
want to know what the mount options are.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 4a01b8a4

fs/nfs/client.c

+8 −8
Original line number Diff line number Diff line
@@ -1063,6 +1063,10 @@ static int nfs4_init_server(struct nfs_server *server, 
	nfs_init_timeout_values(&timeparms, data->nfs_server.protocol,

			data->timeo, data->retrans);



	/* Initialise the client representation from the mount data */

	server->flags = data->flags;

	server->caps |= NFS_CAP_ATOMIC_OPEN;



	/* Get a client record */

	error = nfs4_set_client(server,

			data->nfs_server.hostname,
@@ -1075,10 +1079,6 @@ static int nfs4_init_server(struct nfs_server *server, 
	if (error < 0)

		goto error;



	/* Initialise the client representation from the mount data */

	server->flags = data->flags;

	server->caps |= NFS_CAP_ATOMIC_OPEN;



	if (data->rsize)

		server->rsize = nfs_block_size(data->rsize, NULL);

	if (data->wsize)
@@ -1181,6 +1181,10 @@ struct nfs_server *nfs4_create_referral_server(struct nfs_clone_mount *data, 
	parent_server = NFS_SB(data->sb);

	parent_client = parent_server->nfs_client;



	/* Initialise the client representation from the parent server */

	nfs_server_copy_userdata(server, parent_server);

	server->caps |= NFS_CAP_ATOMIC_OPEN;



	/* Get a client representation.

	 * Note: NFSv4 always uses TCP, */

	error = nfs4_set_client(server, data->hostname,
@@ -1193,10 +1197,6 @@ struct nfs_server *nfs4_create_referral_server(struct nfs_clone_mount *data, 
	if (error < 0)

		goto error;



	/* Initialise the client representation from the parent server */

	nfs_server_copy_userdata(server, parent_server);

	server->caps |= NFS_CAP_ATOMIC_OPEN;



	error = nfs_init_server_rpcclient(server, parent_server->client->cl_timeout, data->authflavor);

	if (error < 0)

		goto error;

CRA Git | Maintained and supported by SUSTech CRA and CCSE