Skip to content

Commit

Permalink
NFS: Rename nfs41_call_sync_data as a common data structure
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Chuck Lever authored and Trond Myklebust committed Sep 3, 2013
1 parent e8d9238 commit 2a3eb2b
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions fs/nfs/nfs4proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,12 @@ static void renew_lease(const struct nfs_server *server, unsigned long timestamp
do_renew_lease(server->nfs_client, timestamp);
}

struct nfs4_call_sync_data {
const struct nfs_server *seq_server;
struct nfs4_sequence_args *seq_args;
struct nfs4_sequence_res *seq_res;
};

#if defined(CONFIG_NFS_V4_1)

static void nfs41_sequence_free_slot(struct nfs4_sequence_res *res)
Expand Down Expand Up @@ -714,15 +720,9 @@ int nfs4_setup_sequence(const struct nfs_server *server,
return ret;
}

struct nfs41_call_sync_data {
const struct nfs_server *seq_server;
struct nfs4_sequence_args *seq_args;
struct nfs4_sequence_res *seq_res;
};

static void nfs41_call_sync_prepare(struct rpc_task *task, void *calldata)
{
struct nfs41_call_sync_data *data = calldata;
struct nfs4_call_sync_data *data = calldata;
struct nfs4_session *session = nfs4_get_session(data->seq_server);

dprintk("--> %s data->seq_server %p\n", __func__, data->seq_server);
Expand All @@ -732,7 +732,7 @@ static void nfs41_call_sync_prepare(struct rpc_task *task, void *calldata)

static void nfs41_call_sync_done(struct rpc_task *task, void *calldata)
{
struct nfs41_call_sync_data *data = calldata;
struct nfs4_call_sync_data *data = calldata;

nfs41_sequence_done(task, data->seq_res);
}
Expand All @@ -750,7 +750,7 @@ static int nfs4_call_sync_sequence(struct rpc_clnt *clnt,
{
int ret;
struct rpc_task *task;
struct nfs41_call_sync_data data = {
struct nfs4_call_sync_data data = {
.seq_server = server,
.seq_args = args,
.seq_res = res,
Expand Down

0 comments on commit 2a3eb2b

Please sign in to comment.