leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NFS4: move ctx into nfs4_run_open_task

Browse Source 
Preparing to add conditional LAYOUTGET to OPEN rpc, the LAYOUTGET
will need the ctx info.

Signed-off-by: Fred Isaman <fred.isaman@gmail.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Fred Isaman 2016-09-19 10:06:49 -04:00 committed by Trond Myklebust
parent 808ba32abe
commit 3b65a30df9
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fs/nfs/nfs4proc.c
View File

@ -86,7 +86,6 @@
| ATTR_MTIME_SET) | ATTR_MTIME_SET)
struct nfs4_opendata; struct nfs4_opendata;
static int _nfs4_proc_open(struct nfs4_opendata *data);
static int _nfs4_recover_proc_open(struct nfs4_opendata *data); static int _nfs4_recover_proc_open(struct nfs4_opendata *data);
static int nfs4_do_fsinfo(struct nfs_server *, struct nfs_fh *, struct nfs_fsinfo *); static int nfs4_do_fsinfo(struct nfs_server *, struct nfs_fh *, struct nfs_fsinfo *);
static void nfs_fixup_referral_attributes(struct nfs_fattr *fattr); static void nfs_fixup_referral_attributes(struct nfs_fattr *fattr);
@ -2327,7 +2326,8 @@ static const struct rpc_call_ops nfs4_open_ops = {
.rpc_release = nfs4_open_release, .rpc_release = nfs4_open_release,
}; };
static int nfs4_run_open_task(struct nfs4_opendata *data, int isrecover) static int nfs4_run_open_task(struct nfs4_opendata *data,
struct nfs_open_context *ctx)
{ {
struct inode *dir = d_inode(data->dir); struct inode *dir = d_inode(data->dir);
struct nfs_server *server = NFS_SERVER(dir); struct nfs_server *server = NFS_SERVER(dir);
@ -2350,14 +2350,16 @@ static int nfs4_run_open_task(struct nfs4_opendata *data, int isrecover)
}; };
int status; int status;
nfs4_init_sequence(&o_arg->seq_args, &o_res->seq_res, 1, isrecover);
kref_get(&data->kref); kref_get(&data->kref);
data->rpc_done = false; data->rpc_done = false;
data->rpc_status = 0; data->rpc_status = 0;
data->cancelled = false; data->cancelled = false;
data->is_recover = false; data->is_recover = false;
if (isrecover) if (!ctx) {
nfs4_init_sequence(&o_arg->seq_args, &o_res->seq_res, 1, 1);
data->is_recover = true; data->is_recover = true;
} else
nfs4_init_sequence(&o_arg->seq_args, &o_res->seq_res, 1, 0);
task = rpc_run_task(&task_setup_data); task = rpc_run_task(&task_setup_data);
if (IS_ERR(task)) if (IS_ERR(task))
return PTR_ERR(task); return PTR_ERR(task);
@ -2378,7 +2380,7 @@ static int _nfs4_recover_proc_open(struct nfs4_opendata *data)
struct nfs_openres *o_res = &data->o_res; struct nfs_openres *o_res = &data->o_res;
int status; int status;
status = nfs4_run_open_task(data, 1); status = nfs4_run_open_task(data, NULL);
if (status != 0 || !data->rpc_done) if (status != 0 || !data->rpc_done)
return status; return status;
@ -2439,7 +2441,8 @@ static int nfs4_opendata_access(struct rpc_cred *cred,
/* /*
* Note: On error, nfs4_proc_open will free the struct nfs4_opendata * Note: On error, nfs4_proc_open will free the struct nfs4_opendata
*/ */
static int _nfs4_proc_open(struct nfs4_opendata *data) static int _nfs4_proc_open(struct nfs4_opendata *data,
struct nfs_open_context *ctx)
{ {
struct inode *dir = d_inode(data->dir); struct inode *dir = d_inode(data->dir);
struct nfs_server *server = NFS_SERVER(dir); struct nfs_server *server = NFS_SERVER(dir);
@ -2447,7 +2450,7 @@ static int _nfs4_proc_open(struct nfs4_opendata *data)
struct nfs_openres *o_res = &data->o_res; struct nfs_openres *o_res = &data->o_res;
int status; int status;
status = nfs4_run_open_task(data, 0); status = nfs4_run_open_task(data, ctx);
if (!data->rpc_done) if (!data->rpc_done)
return status; return status;
if (status != 0) { if (status != 0) {
@ -2798,7 +2801,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
seq = raw_seqcount_begin(&sp->so_reclaim_seqcount); seq = raw_seqcount_begin(&sp->so_reclaim_seqcount);
ret = _nfs4_proc_open(opendata); ret = _nfs4_proc_open(opendata, ctx);
if (ret != 0) if (ret != 0)
goto out; goto out;