aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/read.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/nfs/read.c')
-rw-r--r--fs/nfs/read.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 2662c0298dd0..cc1f758a7ee1 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -464,23 +464,14 @@ static void nfs_readpage_release_partial(void *calldata)
464 nfs_readdata_release(calldata); 464 nfs_readdata_release(calldata);
465} 465}
466 466
467#if defined(CONFIG_NFS_V4_1)
468void nfs_read_prepare(struct rpc_task *task, void *calldata) 467void nfs_read_prepare(struct rpc_task *task, void *calldata)
469{ 468{
470 struct nfs_read_data *data = calldata; 469 struct nfs_read_data *data = calldata;
471 470 NFS_PROTO(data->inode)->read_rpc_prepare(task, data);
472 if (nfs4_setup_sequence(NFS_SERVER(data->inode),
473 &data->args.seq_args, &data->res.seq_res,
474 task))
475 return;
476 rpc_call_start(task);
477} 471}
478#endif /* CONFIG_NFS_V4_1 */
479 472
480static const struct rpc_call_ops nfs_read_partial_ops = { 473static const struct rpc_call_ops nfs_read_partial_ops = {
481#if defined(CONFIG_NFS_V4_1)
482 .rpc_call_prepare = nfs_read_prepare, 474 .rpc_call_prepare = nfs_read_prepare,
483#endif /* CONFIG_NFS_V4_1 */
484 .rpc_call_done = nfs_readpage_result_partial, 475 .rpc_call_done = nfs_readpage_result_partial,
485 .rpc_release = nfs_readpage_release_partial, 476 .rpc_release = nfs_readpage_release_partial,
486}; 477};
@@ -544,9 +535,7 @@ static void nfs_readpage_release_full(void *calldata)
544} 535}
545 536
546static const struct rpc_call_ops nfs_read_full_ops = { 537static const struct rpc_call_ops nfs_read_full_ops = {
547#if defined(CONFIG_NFS_V4_1)
548 .rpc_call_prepare = nfs_read_prepare, 538 .rpc_call_prepare = nfs_read_prepare,
549#endif /* CONFIG_NFS_V4_1 */
550 .rpc_call_done = nfs_readpage_result_full, 539 .rpc_call_done = nfs_readpage_result_full,
551 .rpc_release = nfs_readpage_release_full, 540 .rpc_release = nfs_readpage_release_full,
552}; 541};