aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4proc.c
diff options
context:
space:
mode:
authorBryan Schumaker <bjschuma@netapp.com>2012-03-19 14:54:40 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-03-21 09:31:45 -0400
commitea7c330362257c072791aeaf03bae2cebf9fb984 (patch)
tree5633ea3278a8ad9b81891bd1fd149af76ad3fe7d /fs/nfs/nfs4proc.c
parentc6cb80d00be42f30716ec817b963bcec094433b5 (diff)
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: Bryan Schumaker <bjschuma@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-rw-r--r--fs/nfs/nfs4proc.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index dc910691acc..915385fcf53 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -3299,6 +3299,16 @@ static void nfs4_proc_read_setup(struct nfs_read_data *data, struct rpc_message
3299 nfs41_init_sequence(&data->args.seq_args, &data->res.seq_res, 0); 3299 nfs41_init_sequence(&data->args.seq_args, &data->res.seq_res, 0);
3300} 3300}
3301 3301
3302static void nfs4_proc_read_rpc_prepare(struct rpc_task *task, struct nfs_read_data *data)
3303{
3304 if (nfs4_setup_sequence(NFS_SERVER(data->inode),
3305 &data->args.seq_args,
3306 &data->res.seq_res,
3307 task))
3308 return;
3309 rpc_call_start(task);
3310}
3311
3302/* Reset the the nfs_read_data to send the read to the MDS. */ 3312/* Reset the the nfs_read_data to send the read to the MDS. */
3303void nfs4_reset_read(struct rpc_task *task, struct nfs_read_data *data) 3313void nfs4_reset_read(struct rpc_task *task, struct nfs_read_data *data)
3304{ 3314{
@@ -6457,6 +6467,7 @@ const struct nfs_rpc_ops nfs_v4_clientops = {
6457 .set_capabilities = nfs4_server_capabilities, 6467 .set_capabilities = nfs4_server_capabilities,
6458 .decode_dirent = nfs4_decode_dirent, 6468 .decode_dirent = nfs4_decode_dirent,
6459 .read_setup = nfs4_proc_read_setup, 6469 .read_setup = nfs4_proc_read_setup,
6470 .read_rpc_prepare = nfs4_proc_read_rpc_prepare,
6460 .read_done = nfs4_read_done, 6471 .read_done = nfs4_read_done,
6461 .write_setup = nfs4_proc_write_setup, 6472 .write_setup = nfs4_proc_write_setup,
6462 .write_rpc_prepare = nfs4_proc_write_rpc_prepare, 6473 .write_rpc_prepare = nfs4_proc_write_rpc_prepare,