Merge branch 'multipath_tcp' (c98ebe29) · Commits · 戴 / test

fs/nfs/client.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -176,6 +176,7 @@ struct nfs_client nfs_alloc_client(const struct nfs_client_initdata cl_init)
		clp->cl_rpcclient = ERR_PTR(-EINVAL);

		clp->cl_proto = cl_init->proto;
		clp->cl_nconnect = cl_init->nconnect;
		clp->cl_net = get_net(cl_init->net);

		clp->cl_principal = "*";
		@@ -494,6 +495,7 @@ int nfs_create_rpc_client(struct nfs_client *clp,
		struct rpc_create_args args = {
		.net = clp->cl_net,
		.protocol = clp->cl_proto,
		.nconnect = clp->cl_nconnect,
		.address = (struct sockaddr *)&clp->cl_addr,
		.addrsize = clp->cl_addrlen,
		.timeout = cl_init->timeparms,
		@@ -659,6 +661,7 @@ static int nfs_init_server(struct nfs_server *server,
		.net = data->net,
		.timeparms = &timeparms,
		.cred = server->cred,
		.nconnect = data->nfs_server.nconnect,
		};
		struct nfs_client *clp;
		int error;

fs/nfs/internal.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -82,6 +82,7 @@ struct nfs_client_initdata {
		struct nfs_subversion *nfs_mod;
		int proto;
		u32 minorversion;
		unsigned int nconnect;
		struct net *net;
		const struct rpc_timeout *timeparms;
		const struct cred *cred;
		@@ -123,6 +124,7 @@ struct nfs_parsed_mount_data {
		char *export_path;
		int port;
		unsigned short protocol;
		unsigned short nconnect;
		} nfs_server;

		void *lsm_opts;

fs/nfs/nfs3client.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,9 @@ struct nfs_client nfs3_set_ds_client(struct nfs_server mds_srv,
		return ERR_PTR(-EINVAL);
		cl_init.hostname = buf;

		if (mds_clp->cl_nconnect > 1 && ds_proto == XPRT_TRANSPORT_TCP)
		cl_init.nconnect = mds_clp->cl_nconnect;

		if (mds_srv->flags & NFS_MOUNT_NORESVPORT)
		set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags);

fs/nfs/nfs4client.c

+12 −2

Original line number	Diff line number	Diff line
		@@ -859,7 +859,8 @@ static int nfs4_set_client(struct nfs_server *server,
		const size_t addrlen,
		const char *ip_addr,
		int proto, const struct rpc_timeout *timeparms,
		u32 minorversion, struct net *net)
		u32 minorversion, unsigned int nconnect,
		struct net *net)
		{
		struct nfs_client_initdata cl_init = {
		.hostname = hostname,
		@@ -875,6 +876,8 @@ static int nfs4_set_client(struct nfs_server *server,
		};
		struct nfs_client *clp;

		if (minorversion > 0 && proto == XPRT_TRANSPORT_TCP)
		cl_init.nconnect = nconnect;
		if (server->flags & NFS_MOUNT_NORESVPORT)
		set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags);
		if (server->options & NFS_OPTION_MIGRATION)
		@@ -941,6 +944,9 @@ struct nfs_client nfs4_set_ds_client(struct nfs_server mds_srv,
		return ERR_PTR(-EINVAL);
		cl_init.hostname = buf;

		if (mds_clp->cl_nconnect > 1 && ds_proto == XPRT_TRANSPORT_TCP)
		cl_init.nconnect = mds_clp->cl_nconnect;

		if (mds_srv->flags & NFS_MOUNT_NORESVPORT)
		__set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags);

		@@ -1074,6 +1080,7 @@ static int nfs4_init_server(struct nfs_server *server,
		data->nfs_server.protocol,
		&timeparms,
		data->minorversion,
		data->nfs_server.nconnect,
		data->net);
		if (error < 0)
		return error;
		@@ -1163,6 +1170,7 @@ struct nfs_server nfs4_create_referral_server(struct nfs_clone_mount data,
		XPRT_TRANSPORT_RDMA,
		parent_server->client->cl_timeout,
		parent_client->cl_mvops->minor_version,
		parent_client->cl_nconnect,
		parent_client->cl_net);
		if (!error)
		goto init_server;
		@@ -1176,6 +1184,7 @@ struct nfs_server nfs4_create_referral_server(struct nfs_clone_mount data,
		XPRT_TRANSPORT_TCP,
		parent_server->client->cl_timeout,
		parent_client->cl_mvops->minor_version,
		parent_client->cl_nconnect,
		parent_client->cl_net);
		if (error < 0)
		goto error;
		@@ -1271,7 +1280,8 @@ int nfs4_update_server(struct nfs_server server, const char hostname,
		set_bit(NFS_MIG_TSM_POSSIBLE, &server->mig_status);
		error = nfs4_set_client(server, hostname, sap, salen, buf,
		clp->cl_proto, clnt->cl_timeout,
		clp->cl_minorversion, net);
		clp->cl_minorversion,
		clp->cl_nconnect, net);
		clear_bit(NFS_MIG_TSM_POSSIBLE, &server->mig_status);
		if (error != 0) {
		nfs_server_insert_lists(server);

fs/nfs/nfs4proc.c

+13 −9

Original line number	Diff line number	Diff line
		@@ -5992,7 +5992,7 @@ int nfs4_proc_setclientid(struct nfs_client *clp, u32 program,
		.rpc_message = &msg,
		.callback_ops = &nfs4_setclientid_ops,
		.callback_data = &setclientid,
		.flags = RPC_TASK_TIMEOUT,
		.flags = RPC_TASK_TIMEOUT \| RPC_TASK_NO_ROUND_ROBIN,
		};
		int status;

		@@ -6058,7 +6058,8 @@ int nfs4_proc_setclientid_confirm(struct nfs_client *clp,
		dprintk("NFS call setclientid_confirm auth=%s, (client ID %llx)\n",
		clp->cl_rpcclient->cl_auth->au_ops->au_name,
		clp->cl_clientid);
		status = rpc_call_sync(clp->cl_rpcclient, &msg, RPC_TASK_TIMEOUT);
		status = rpc_call_sync(clp->cl_rpcclient, &msg,
		RPC_TASK_TIMEOUT \| RPC_TASK_NO_ROUND_ROBIN);
		trace_nfs4_setclientid_confirm(clp, status);
		dprintk("NFS reply setclientid_confirm: %d\n", status);
		return status;
		@@ -7639,7 +7640,7 @@ static int _nfs4_proc_secinfo(struct inode dir, const struct qstr name, struct
		NFS_SP4_MACH_CRED_SECINFO, &clnt, &msg);

		status = nfs4_call_sync(clnt, NFS_SERVER(dir), &msg, &args.seq_args,
		&res.seq_res, 0);
		&res.seq_res, RPC_TASK_NO_ROUND_ROBIN);
		dprintk("NFS reply secinfo: %d\n", status);

		put_cred(cred);
		@@ -7977,7 +7978,7 @@ nfs4_run_exchange_id(struct nfs_client clp, const struct cred cred,
		.rpc_client = clp->cl_rpcclient,
		.callback_ops = &nfs4_exchange_id_call_ops,
		.rpc_message = &msg,
		.flags = RPC_TASK_TIMEOUT,
		.flags = RPC_TASK_TIMEOUT \| RPC_TASK_NO_ROUND_ROBIN,
		};
		struct nfs41_exchange_id_data *calldata;
		int status;
		@@ -8202,7 +8203,8 @@ static int _nfs4_proc_destroy_clientid(struct nfs_client *clp,
		};
		int status;

		status = rpc_call_sync(clp->cl_rpcclient, &msg, RPC_TASK_TIMEOUT);
		status = rpc_call_sync(clp->cl_rpcclient, &msg,
		RPC_TASK_TIMEOUT \| RPC_TASK_NO_ROUND_ROBIN);
		trace_nfs4_destroy_clientid(clp, status);
		if (status)
		dprintk("NFS: Got error %d from the server %s on "
		@@ -8481,7 +8483,8 @@ static int _nfs4_proc_create_session(struct nfs_client *clp,
		nfs4_init_channel_attrs(&args, clp->cl_rpcclient);
		args.flags = (SESSION4_PERSIST \| SESSION4_BACK_CHAN);

		status = rpc_call_sync(session->clp->cl_rpcclient, &msg, RPC_TASK_TIMEOUT);
		status = rpc_call_sync(session->clp->cl_rpcclient, &msg,
		RPC_TASK_TIMEOUT \| RPC_TASK_NO_ROUND_ROBIN);
		trace_nfs4_create_session(clp, status);

		switch (status) {
		@@ -8557,7 +8560,8 @@ int nfs4_proc_destroy_session(struct nfs4_session *session,
		if (!test_and_clear_bit(NFS4_SESSION_ESTABLISHED, &session->session_state))
		return 0;

		status = rpc_call_sync(session->clp->cl_rpcclient, &msg, RPC_TASK_TIMEOUT);
		status = rpc_call_sync(session->clp->cl_rpcclient, &msg,
		RPC_TASK_TIMEOUT \| RPC_TASK_NO_ROUND_ROBIN);
		trace_nfs4_destroy_session(session->clp, status);

		if (status)
		@@ -8811,7 +8815,7 @@ static int nfs41_proc_reclaim_complete(struct nfs_client *clp,
		.rpc_client = clp->cl_rpcclient,
		.rpc_message = &msg,
		.callback_ops = &nfs4_reclaim_complete_call_ops,
		.flags = RPC_TASK_ASYNC,
		.flags = RPC_TASK_ASYNC \| RPC_TASK_NO_ROUND_ROBIN,
		};
		int status = -ENOMEM;

		@@ -9330,7 +9334,7 @@ _nfs41_proc_secinfo_no_name(struct nfs_server server, struct nfs_fh fhandle,

		dprintk("--> %s\n", __func__);
		status = nfs4_call_sync(clnt, server, &msg, &args.seq_args,
		&res.seq_res, 0);
		&res.seq_res, RPC_TASK_NO_ROUND_ROBIN);
		dprintk("<-- %s status=%d\n", __func__, status);

		put_cred(cred);

Admin message