Commit 2a3eb2b97b1268891b0251df537c32daac295503

Authored by Chuck Lever
Committed by Trond Myklebust
1 parent e8d92382dd

NFS: Rename nfs41_call_sync_data as a common data structure

Clean up: rename nfs41_call_sync_data for use as a data structure
common to all NFSv4 minor versions.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

Showing 1 changed file with 9 additions and 9 deletions Side-by-side Diff

... ... @@ -463,6 +463,12 @@
463 463 do_renew_lease(server->nfs_client, timestamp);
464 464 }
465 465  
  466 +struct 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 472 #if defined(CONFIG_NFS_V4_1)
467 473  
468 474 static void nfs41_sequence_free_slot(struct nfs4_sequence_res *res)
469 475  
... ... @@ -714,15 +720,9 @@
714 720 return ret;
715 721 }
716 722  
717   -struct 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   -
723 723 static 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 726 struct nfs4_session *session = nfs4_get_session(data->seq_server);
727 727  
728 728 dprintk("--> %s data->seq_server %p\n", __func__, data->seq_server);
... ... @@ -732,7 +732,7 @@
732 732  
733 733 static 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 737 nfs41_sequence_done(task, data->seq_res);
738 738 }
... ... @@ -750,7 +750,7 @@
750 750 {
751 751 int ret;
752 752 struct rpc_task *task;
753   - struct nfs41_call_sync_data data = {
  753 + struct nfs4_call_sync_data data = {
754 754 .seq_server = server,
755 755 .seq_args = args,
756 756 .seq_res = res,