diff options
author | Bryan Schumaker <bjschuma@netapp.com> | 2012-03-19 14:54:39 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-03-21 09:31:45 -0400 |
commit | c6cb80d00be42f30716ec817b963bcec094433b5 (patch) | |
tree | 8049071fc2c5f01a730eb47bfa95ee095ce677df /fs/nfs/nfs4proc.c | |
parent | 6f00866ddd15724eb20eac4ddf6e2c6c1a6cfcdc (diff) |
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: 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.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index d41d97fb4cb9..dc910691acc0 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
@@ -3373,6 +3373,16 @@ static void nfs4_proc_write_setup(struct nfs_write_data *data, struct rpc_messag | |||
3373 | nfs41_init_sequence(&data->args.seq_args, &data->res.seq_res, 1); | 3373 | nfs41_init_sequence(&data->args.seq_args, &data->res.seq_res, 1); |
3374 | } | 3374 | } |
3375 | 3375 | ||
3376 | static void nfs4_proc_write_rpc_prepare(struct rpc_task *task, struct nfs_write_data *data) | ||
3377 | { | ||
3378 | if (nfs4_setup_sequence(NFS_SERVER(data->inode), | ||
3379 | &data->args.seq_args, | ||
3380 | &data->res.seq_res, | ||
3381 | task)) | ||
3382 | return; | ||
3383 | rpc_call_start(task); | ||
3384 | } | ||
3385 | |||
3376 | static int nfs4_commit_done_cb(struct rpc_task *task, struct nfs_write_data *data) | 3386 | static int nfs4_commit_done_cb(struct rpc_task *task, struct nfs_write_data *data) |
3377 | { | 3387 | { |
3378 | struct inode *inode = data->inode; | 3388 | struct inode *inode = data->inode; |
@@ -6449,6 +6459,7 @@ const struct nfs_rpc_ops nfs_v4_clientops = { | |||
6449 | .read_setup = nfs4_proc_read_setup, | 6459 | .read_setup = nfs4_proc_read_setup, |
6450 | .read_done = nfs4_read_done, | 6460 | .read_done = nfs4_read_done, |
6451 | .write_setup = nfs4_proc_write_setup, | 6461 | .write_setup = nfs4_proc_write_setup, |
6462 | .write_rpc_prepare = nfs4_proc_write_rpc_prepare, | ||
6452 | .write_done = nfs4_write_done, | 6463 | .write_done = nfs4_write_done, |
6453 | .commit_setup = nfs4_proc_commit_setup, | 6464 | .commit_setup = nfs4_proc_commit_setup, |
6454 | .commit_done = nfs4_commit_done, | 6465 | .commit_done = nfs4_commit_done, |