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

Commit ea7c3303 authored by Bryan Schumaker's avatar Bryan Schumaker Committed by Trond Myklebust
Browse files

NFS: Remove nfs4_setup_sequence from generic read code 



This is an NFS v4 specific operation, so it belongs in the NFS v4 code
and not the generic client.

Signed-off-by: default avatarBryan Schumaker <bjschuma@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent c6cb80d0

fs/nfs/direct.c

+0 −2
Original line number Diff line number Diff line
@@ -265,9 +265,7 @@ static void nfs_direct_read_release(void *calldata) 
}



static const struct rpc_call_ops nfs_read_direct_ops = {

#if defined(CONFIG_NFS_V4_1)

	.rpc_call_prepare = nfs_read_prepare,

#endif /* CONFIG_NFS_V4_1 */

	.rpc_call_done = nfs_direct_read_result,

	.rpc_release = nfs_direct_read_release,

};

fs/nfs/nfs3proc.c

+6 −0
Original line number Diff line number Diff line
@@ -814,6 +814,11 @@ static void nfs3_proc_read_setup(struct nfs_read_data *data, struct rpc_message 
	msg->rpc_proc = &nfs3_procedures[NFS3PROC_READ];

}



static void nfs3_proc_read_rpc_prepare(struct rpc_task *task, struct nfs_read_data *data)

{

	rpc_call_start(task);

}



static int nfs3_write_done(struct rpc_task *task, struct nfs_write_data *data)

{

	if (nfs3_async_handle_jukebox(task, data->inode))
@@ -884,6 +889,7 @@ const struct nfs_rpc_ops nfs_v3_clientops = { 
	.pathconf	= nfs3_proc_pathconf,

	.decode_dirent	= nfs3_decode_dirent,

	.read_setup	= nfs3_proc_read_setup,

	.read_rpc_prepare = nfs3_proc_read_rpc_prepare,

	.read_done	= nfs3_read_done,

	.write_setup	= nfs3_proc_write_setup,

	.write_rpc_prepare = nfs3_proc_write_rpc_prepare,

fs/nfs/nfs4proc.c

+11 −0
Original line number Diff line number Diff line
@@ -3299,6 +3299,16 @@ static void nfs4_proc_read_setup(struct nfs_read_data *data, struct rpc_message 
	nfs41_init_sequence(&data->args.seq_args, &data->res.seq_res, 0);

}



static void nfs4_proc_read_rpc_prepare(struct rpc_task *task, struct nfs_read_data *data)

{

	if (nfs4_setup_sequence(NFS_SERVER(data->inode),

				&data->args.seq_args,

				&data->res.seq_res,

				task))

		return;

	rpc_call_start(task);

}



/* Reset the the nfs_read_data to send the read to the MDS. */

void nfs4_reset_read(struct rpc_task *task, struct nfs_read_data *data)

{
@@ -6457,6 +6467,7 @@ const struct nfs_rpc_ops nfs_v4_clientops = { 
	.set_capabilities = nfs4_server_capabilities,

	.decode_dirent	= nfs4_decode_dirent,

	.read_setup	= nfs4_proc_read_setup,

	.read_rpc_prepare = nfs4_proc_read_rpc_prepare,

	.read_done	= nfs4_read_done,

	.write_setup	= nfs4_proc_write_setup,

	.write_rpc_prepare = nfs4_proc_write_rpc_prepare,

fs/nfs/proc.c

+6 −0
Original line number Diff line number Diff line
@@ -651,6 +651,11 @@ static void nfs_proc_read_setup(struct nfs_read_data *data, struct rpc_message * 
	msg->rpc_proc = &nfs_procedures[NFSPROC_READ];

}



static void nfs_proc_read_rpc_prepare(struct rpc_task *task, struct nfs_read_data *data)

{

	rpc_call_start(task);

}



static int nfs_write_done(struct rpc_task *task, struct nfs_write_data *data)

{

	if (nfs_async_handle_expired_key(task))
@@ -741,6 +746,7 @@ const struct nfs_rpc_ops nfs_v2_clientops = { 
	.pathconf	= nfs_proc_pathconf,

	.decode_dirent	= nfs2_decode_dirent,

	.read_setup	= nfs_proc_read_setup,

	.read_rpc_prepare = nfs_proc_read_rpc_prepare,

	.read_done	= nfs_read_done,

	.write_setup	= nfs_proc_write_setup,

	.write_rpc_prepare = nfs_proc_write_rpc_prepare,

fs/nfs/read.c

+1 −12
Original line number Diff line number Diff line
@@ -464,23 +464,14 @@ static void nfs_readpage_release_partial(void *calldata) 
	nfs_readdata_release(calldata);

}



#if defined(CONFIG_NFS_V4_1)

void nfs_read_prepare(struct rpc_task *task, void *calldata)

{

	struct nfs_read_data *data = calldata;



	if (nfs4_setup_sequence(NFS_SERVER(data->inode),

				&data->args.seq_args, &data->res.seq_res,

				task))

		return;

	rpc_call_start(task);

	NFS_PROTO(data->inode)->read_rpc_prepare(task, data);

}

#endif /* CONFIG_NFS_V4_1 */



static const struct rpc_call_ops nfs_read_partial_ops = {

#if defined(CONFIG_NFS_V4_1)

	.rpc_call_prepare = nfs_read_prepare,

#endif /* CONFIG_NFS_V4_1 */

	.rpc_call_done = nfs_readpage_result_partial,

	.rpc_release = nfs_readpage_release_partial,

};
@@ -544,9 +535,7 @@ static void nfs_readpage_release_full(void *calldata) 
}



static const struct rpc_call_ops nfs_read_full_ops = {

#if defined(CONFIG_NFS_V4_1)

	.rpc_call_prepare = nfs_read_prepare,

#endif /* CONFIG_NFS_V4_1 */

	.rpc_call_done = nfs_readpage_result_full,

	.rpc_release = nfs_readpage_release_full,

};