hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Chuck Lever 2013-08-09 12:48:00 -04:00 committed by Trond Myklebust
parent e8d92382dd
commit 2a3eb2b97b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/nfs/nfs4proc.c
View File

@ -463,6 +463,12 @@ static void renew_lease(const struct nfs_server *server, unsigned long timestamp
do_renew_lease(server->nfs_client, 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) #if defined(CONFIG_NFS_V4_1)
static void nfs41_sequence_free_slot(struct nfs4_sequence_res *res) static void nfs41_sequence_free_slot(struct nfs4_sequence_res *res)
@ -714,15 +720,9 @@ out:
return ret; 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) 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); struct nfs4_session *session = nfs4_get_session(data->seq_server);
dprintk("--> %s data->seq_server %p\n", __func__, data->seq_server); 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)
static void nfs41_call_sync_done(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); nfs41_sequence_done(task, data->seq_res);
} }
@ -750,7 +750,7 @@ static int nfs4_call_sync_sequence(struct rpc_clnt *clnt,
{ {
int ret; int ret;
struct rpc_task *task; struct rpc_task *task;
struct nfs41_call_sync_data data = { struct nfs4_call_sync_data data = {
.seq_server = server, .seq_server = server,
.seq_args = args, .seq_args = args,
.seq_res = res, .seq_res = res,