AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

NFSv4.1: Handle BAD_STATEID and EXPIRED errors in layoutget

Browse Source 
If the layoutget call returns a stateid error, we want to invalidate the
layout stateid, and/or recover the open stateid.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2012-10-01 17:25:48 -07:00
parent 6f018efac1
commit ee314c2a35
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
fs/nfs/nfs4proc.c
View File

@ -6272,26 +6272,44 @@ nfs4_layoutget_prepare(struct rpc_task *task, void *calldata)
static void nfs4_layoutget_done(struct rpc_task *task, void *calldata) static void nfs4_layoutget_done(struct rpc_task *task, void *calldata)
{ {
struct nfs4_layoutget *lgp = calldata; struct nfs4_layoutget *lgp = calldata;
struct nfs_server *server = NFS_SERVER(lgp->args.inode); struct inode *inode = lgp->args.inode;
struct nfs_server *server = NFS_SERVER(inode);
struct pnfs_layout_hdr *lo;
struct nfs4_state *state = NULL;
dprintk("--> %s\n", __func__); dprintk("--> %s\n", __func__);
if (!nfs4_sequence_done(task, &lgp->res.seq_res)) if (!nfs4_sequence_done(task, &lgp->res.seq_res))
return; goto out;
switch (task->tk_status) { switch (task->tk_status) {
case 0: case 0:
break; goto out;
case -NFS4ERR_LAYOUTTRYLATER: case -NFS4ERR_LAYOUTTRYLATER:
case -NFS4ERR_RECALLCONFLICT: case -NFS4ERR_RECALLCONFLICT:
task->tk_status = -NFS4ERR_DELAY; task->tk_status = -NFS4ERR_DELAY;
/* Fall through */ break;
default: case -NFS4ERR_EXPIRED:
if (nfs4_async_handle_error(task, server, NULL) == -EAGAIN) { case -NFS4ERR_BAD_STATEID:
rpc_restart_call_prepare(task); spin_lock(&inode->i_lock);
return; lo = NFS_I(inode)->layout;
if (!lo || list_empty(&lo->plh_segs)) {
spin_unlock(&inode->i_lock);
/* If the open stateid was bad, then recover it. */
state = lgp->args.ctx->state;
} else {
LIST_HEAD(head);
pnfs_mark_matching_lsegs_invalid(lo, &head, NULL);
spin_unlock(&inode->i_lock);
/* Mark the bad layout state as invalid, then
* retry using the open stateid. */
pnfs_free_lseg_list(&head);
} }
} }
if (nfs4_async_handle_error(task, server, state) == -EAGAIN)
rpc_restart_call_prepare(task);
out:
dprintk("<-- %s\n", __func__); dprintk("<-- %s\n", __func__);
} }