aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4proc.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-rw-r--r--fs/nfs/nfs4proc.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 05742b81a2a8..069cd822aaad 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -463,6 +463,12 @@ static void renew_lease(const struct nfs_server *server, unsigned long timestamp
463 do_renew_lease(server->nfs_client, timestamp); 463 do_renew_lease(server->nfs_client, timestamp);
464} 464}
465 465
466struct nfs4_call_sync_data {
467 const struct nfs_server *seq_server;
468 struct nfs4_sequence_args *seq_args;
469 struct nfs4_sequence_res *seq_res;
470};
471
466#if defined(CONFIG_NFS_V4_1) 472#if defined(CONFIG_NFS_V4_1)
467 473
468static void nfs41_sequence_free_slot(struct nfs4_sequence_res *res) 474static void nfs41_sequence_free_slot(struct nfs4_sequence_res *res)
@@ -714,15 +720,9 @@ out:
714 return ret; 720 return ret;
715} 721}
716 722
717struct nfs41_call_sync_data {
718 const struct nfs_server *seq_server;
719 struct nfs4_sequence_args *seq_args;
720 struct nfs4_sequence_res *seq_res;
721};
722
723static void nfs41_call_sync_prepare(struct rpc_task *task, void *calldata) 723static void nfs41_call_sync_prepare(struct rpc_task *task, void *calldata)
724{ 724{
725 struct nfs41_call_sync_data *data = calldata; 725 struct nfs4_call_sync_data *data = calldata;
726 struct nfs4_session *session = nfs4_get_session(data->seq_server); 726 struct nfs4_session *session = nfs4_get_session(data->seq_server);
727 727
728 dprintk("--> %s data->seq_server %p\n", __func__, data->seq_server); 728 dprintk("--> %s data->seq_server %p\n", __func__, data->seq_server);
@@ -732,7 +732,7 @@ static void nfs41_call_sync_prepare(struct rpc_task *task, void *calldata)
732 732
733static void nfs41_call_sync_done(struct rpc_task *task, void *calldata) 733static void nfs41_call_sync_done(struct rpc_task *task, void *calldata)
734{ 734{
735 struct nfs41_call_sync_data *data = calldata; 735 struct nfs4_call_sync_data *data = calldata;
736 736
737 nfs41_sequence_done(task, data->seq_res); 737 nfs41_sequence_done(task, data->seq_res);
738} 738}
@@ -750,7 +750,7 @@ static int nfs4_call_sync_sequence(struct rpc_clnt *clnt,
750{ 750{
751 int ret; 751 int ret;
752 struct rpc_task *task; 752 struct rpc_task *task;
753 struct nfs41_call_sync_data data = { 753 struct nfs4_call_sync_data data = {
754 .seq_server = server, 754 .seq_server = server,
755 .seq_args = args, 755 .seq_args = args,
756 .seq_res = res, 756 .seq_res = res,