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

NFSv4: Convert CLOSE to use nfs4_async_handle_exception()

Browse Source 
Convert CLOSE so that it specifies the correct stateid, state and
inode for the error handling.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Trond Myklebust 2017-11-07 10:51:37 -05:00
parent 7f1bda447c
commit b8b8d22109
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/nfs/nfs4proc.c
View File

@ -3148,6 +3148,11 @@ static void nfs4_close_done(struct rpc_task *task, void *data)
struct nfs4_state *state = calldata->state; struct nfs4_state *state = calldata->state;
struct nfs_server *server = NFS_SERVER(calldata->inode); struct nfs_server *server = NFS_SERVER(calldata->inode);
nfs4_stateid *res_stateid = NULL; nfs4_stateid *res_stateid = NULL;
struct nfs4_exception exception = {
.state = state,
.inode = calldata->inode,
.stateid = &calldata->arg.stateid,
};
dprintk("%s: begin!\n", __func__); dprintk("%s: begin!\n", __func__);
if (!nfs4_sequence_done(task, &calldata->res.seq_res)) if (!nfs4_sequence_done(task, &calldata->res.seq_res))
@ -3213,7 +3218,9 @@ static void nfs4_close_done(struct rpc_task *task, void *data)
case -NFS4ERR_BAD_STATEID: case -NFS4ERR_BAD_STATEID:
break; break;
default: default:
if (nfs4_async_handle_error(task, server, state, NULL) == -EAGAIN) task->tk_status = nfs4_async_handle_exception(task,
server, task->tk_status, &exception);
if (exception.retry)
goto out_restart; goto out_restart;
} }
nfs_clear_open_stateid(state, &calldata->arg.stateid, nfs_clear_open_stateid(state, &calldata->arg.stateid,