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

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

NFS: Remove nfs4_setup_sequence from generic write 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 6f00866d

fs/nfs/direct.c

+0 −4
Original line number Diff line number Diff line
@@ -554,9 +554,7 @@ static void nfs_direct_commit_release(void *calldata) 
}



static const struct rpc_call_ops nfs_commit_direct_ops = {

#if defined(CONFIG_NFS_V4_1)

	.rpc_call_prepare = nfs_write_prepare,

#endif /* CONFIG_NFS_V4_1 */

	.rpc_call_done = nfs_direct_commit_result,

	.rpc_release = nfs_direct_commit_release,

};
@@ -696,9 +694,7 @@ static void nfs_direct_write_release(void *calldata) 
}



static const struct rpc_call_ops nfs_write_direct_ops = {

#if defined(CONFIG_NFS_V4_1)

	.rpc_call_prepare = nfs_write_prepare,

#endif /* CONFIG_NFS_V4_1 */

	.rpc_call_done = nfs_direct_write_result,

	.rpc_release = nfs_direct_write_release,

};

fs/nfs/nfs3proc.c

+6 −0
Original line number Diff line number Diff line
@@ -828,6 +828,11 @@ static void nfs3_proc_write_setup(struct nfs_write_data *data, struct rpc_messag 
	msg->rpc_proc = &nfs3_procedures[NFS3PROC_WRITE];

}



static void nfs3_proc_write_rpc_prepare(struct rpc_task *task, struct nfs_write_data *data)

{

	rpc_call_start(task);

}



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

{

	if (nfs3_async_handle_jukebox(task, data->inode))
@@ -881,6 +886,7 @@ const struct nfs_rpc_ops nfs_v3_clientops = { 
	.read_setup	= nfs3_proc_read_setup,

	.read_done	= nfs3_read_done,

	.write_setup	= nfs3_proc_write_setup,

	.write_rpc_prepare = nfs3_proc_write_rpc_prepare,

	.write_done	= nfs3_write_done,

	.commit_setup	= nfs3_proc_commit_setup,

	.commit_done	= nfs3_commit_done,

fs/nfs/nfs4proc.c

+11 −0
Original line number Diff line number Diff line
@@ -3373,6 +3373,16 @@ static void nfs4_proc_write_setup(struct nfs_write_data *data, struct rpc_messag 
	nfs41_init_sequence(&data->args.seq_args, &data->res.seq_res, 1);

}



static void nfs4_proc_write_rpc_prepare(struct rpc_task *task, struct nfs_write_data *data)

{

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

				&data->args.seq_args,

				&data->res.seq_res,

				task))

		return;

	rpc_call_start(task);

}



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

{

	struct inode *inode = data->inode;
@@ -6449,6 +6459,7 @@ const struct nfs_rpc_ops nfs_v4_clientops = { 
	.read_setup	= nfs4_proc_read_setup,

	.read_done	= nfs4_read_done,

	.write_setup	= nfs4_proc_write_setup,

	.write_rpc_prepare = nfs4_proc_write_rpc_prepare,

	.write_done	= nfs4_write_done,

	.commit_setup	= nfs4_proc_commit_setup,

	.commit_done	= nfs4_commit_done,

fs/nfs/proc.c

+6 −0
Original line number Diff line number Diff line
@@ -668,6 +668,11 @@ static void nfs_proc_write_setup(struct nfs_write_data *data, struct rpc_message 
	msg->rpc_proc = &nfs_procedures[NFSPROC_WRITE];

}



static void nfs_proc_write_rpc_prepare(struct rpc_task *task, struct nfs_write_data *data)

{

	rpc_call_start(task);

}



static void

nfs_proc_commit_setup(struct nfs_write_data *data, struct rpc_message *msg)

{
@@ -738,6 +743,7 @@ const struct nfs_rpc_ops nfs_v2_clientops = { 
	.read_setup	= nfs_proc_read_setup,

	.read_done	= nfs_read_done,

	.write_setup	= nfs_proc_write_setup,

	.write_rpc_prepare = nfs_proc_write_rpc_prepare,

	.write_done	= nfs_write_done,

	.commit_setup	= nfs_proc_commit_setup,

	.lock		= nfs_proc_lock,

fs/nfs/write.c

+1 −14
Original line number Diff line number Diff line
@@ -1172,23 +1172,14 @@ static void nfs_writeback_release_partial(void *calldata) 
	nfs_writedata_release(calldata);

}



#if defined(CONFIG_NFS_V4_1)

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

{

	struct nfs_write_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)->write_rpc_prepare(task, data);

}

#endif /* CONFIG_NFS_V4_1 */



static const struct rpc_call_ops nfs_write_partial_ops = {

#if defined(CONFIG_NFS_V4_1)

	.rpc_call_prepare = nfs_write_prepare,

#endif /* CONFIG_NFS_V4_1 */

	.rpc_call_done = nfs_writeback_done_partial,

	.rpc_release = nfs_writeback_release_partial,

};
@@ -1250,9 +1241,7 @@ static void nfs_writeback_release_full(void *calldata) 
}



static const struct rpc_call_ops nfs_write_full_ops = {

#if defined(CONFIG_NFS_V4_1)

	.rpc_call_prepare = nfs_write_prepare,

#endif /* CONFIG_NFS_V4_1 */

	.rpc_call_done = nfs_writeback_done_full,

	.rpc_release = nfs_writeback_release_full,

};
@@ -1544,9 +1533,7 @@ static void nfs_commit_release(void *calldata) 
}



static const struct rpc_call_ops nfs_commit_ops = {

#if defined(CONFIG_NFS_V4_1)

	.rpc_call_prepare = nfs_write_prepare,

#endif /* CONFIG_NFS_V4_1 */

	.rpc_call_done = nfs_commit_done,

	.rpc_release = nfs_commit_release,

};