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

Commit 9915ea7e authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

NFS: Add RPC callouts to start NFSv4.0 synchronous requests 



Refactor nfs4_call_sync_sequence() so it is used for NFSv4.0 now.
The RPC callouts will house transport blocking logic similar to
NFSv4.1 sessions.

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

fs/nfs/nfs4_fs.h

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ struct nfs4_minor_version_ops { 
			struct nfs_fsinfo *);

	int	(*free_lock_state)(struct nfs_server *,

			struct nfs4_lock_state *);

	const struct rpc_call_ops *call_sync_ops;

	const struct nfs4_state_recovery_ops *reboot_recovery_ops;

	const struct nfs4_state_recovery_ops *nograce_recovery_ops;

	const struct nfs4_state_maintenance_ops *state_renewal_ops;

fs/nfs/nfs4proc.c

+41 −20
Original line number Diff line number Diff line
@@ -741,6 +741,41 @@ static const struct rpc_call_ops nfs41_call_sync_ops = { 
	.rpc_call_done = nfs41_call_sync_done,

};



#else

static int nfs4_setup_sequence(const struct nfs_server *server,

			       struct nfs4_sequence_args *args,

			       struct nfs4_sequence_res *res,

			       struct rpc_task *task)

{

	rpc_call_start(task);

	return 0;

}



static int nfs4_sequence_done(struct rpc_task *task,

			       struct nfs4_sequence_res *res)

{

	return 1;

}

#endif /* CONFIG_NFS_V4_1 */



static void nfs40_call_sync_prepare(struct rpc_task *task, void *calldata)

{

	struct nfs4_call_sync_data *data = calldata;

	nfs4_setup_sequence(data->seq_server,

				data->seq_args, data->seq_res, task);

}



static void nfs40_call_sync_done(struct rpc_task *task, void *calldata)

{

	struct nfs4_call_sync_data *data = calldata;

	nfs4_sequence_done(task, data->seq_res);

}



static const struct rpc_call_ops nfs40_call_sync_ops = {

	.rpc_call_prepare = nfs40_call_sync_prepare,

	.rpc_call_done = nfs40_call_sync_done,

};



static int nfs4_call_sync_sequence(struct rpc_clnt *clnt,

				   struct nfs_server *server,

				   struct rpc_message *msg,
@@ -749,6 +784,7 @@ static int nfs4_call_sync_sequence(struct rpc_clnt *clnt, 
{

	int ret;

	struct rpc_task *task;

	struct nfs_client *clp = server->nfs_client;

	struct nfs4_call_sync_data data = {

		.seq_server = server,

		.seq_args = args,
@@ -757,7 +793,7 @@ static int nfs4_call_sync_sequence(struct rpc_clnt *clnt, 
	struct rpc_task_setup task_setup = {

		.rpc_client = clnt,

		.rpc_message = msg,

		.callback_ops = &nfs41_call_sync_ops,

		.callback_ops = clp->cl_mvops->call_sync_ops,

		.callback_data = &data

	};
@@ -771,23 +807,6 @@ static int nfs4_call_sync_sequence(struct rpc_clnt *clnt, 
	return ret;

}



#else

static int nfs4_setup_sequence(const struct nfs_server *server,

			       struct nfs4_sequence_args *args,

			       struct nfs4_sequence_res *res,

			       struct rpc_task *task)

{

	rpc_call_start(task);

	return 0;

}



static int nfs4_sequence_done(struct rpc_task *task,

			       struct nfs4_sequence_res *res)

{

	return 1;

}

#endif /* CONFIG_NFS_V4_1 */



static

int _nfs4_call_sync(struct rpc_clnt *clnt,

		    struct nfs_server *server,
@@ -807,8 +826,7 @@ int nfs4_call_sync(struct rpc_clnt *clnt, 
		   int cache_reply)

{

	nfs4_init_sequence(args, res, cache_reply);

	return server->nfs_client->cl_mvops->call_sync(clnt, server, msg,

						args, res);

	return nfs4_call_sync_sequence(clnt, server, msg, args, res);

}



static void update_changeattr(struct inode *dir, struct nfs4_change_info *cinfo)
@@ -7529,6 +7547,7 @@ static const struct nfs4_minor_version_ops nfs_v4_0_minor_ops = { 
	.match_stateid = nfs4_match_stateid,

	.find_root_sec = nfs4_find_root_sec,

	.free_lock_state = nfs4_release_lockowner,

	.call_sync_ops = &nfs40_call_sync_ops,

	.reboot_recovery_ops = &nfs40_reboot_recovery_ops,

	.nograce_recovery_ops = &nfs40_nograce_recovery_ops,

	.state_renewal_ops = &nfs40_state_renewal_ops,
@@ -7547,6 +7566,7 @@ static const struct nfs4_minor_version_ops nfs_v4_1_minor_ops = { 
	.match_stateid = nfs41_match_stateid,

	.find_root_sec = nfs41_find_root_sec,

	.free_lock_state = nfs41_free_lock_state,

	.call_sync_ops = &nfs41_call_sync_ops,

	.reboot_recovery_ops = &nfs41_reboot_recovery_ops,

	.nograce_recovery_ops = &nfs41_nograce_recovery_ops,

	.state_renewal_ops = &nfs41_state_renewal_ops,
@@ -7566,6 +7586,7 @@ static const struct nfs4_minor_version_ops nfs_v4_2_minor_ops = { 
	.match_stateid = nfs41_match_stateid,

	.find_root_sec = nfs41_find_root_sec,

	.free_lock_state = nfs41_free_lock_state,

	.call_sync_ops = &nfs41_call_sync_ops,

	.reboot_recovery_ops = &nfs41_reboot_recovery_ops,

	.nograce_recovery_ops = &nfs41_nograce_recovery_ops,

	.state_renewal_ops = &nfs41_state_renewal_ops,