diff options
| author |   Christoph Hellwig <hch@lst.de> | 2014-08-21 11:09:21 -0500 |
|---|---|---|
| committer |   Trond Myklebust <trond.myklebust@primarydata.com> | 2014-09-10 12:47:01 -0700 |
| commit | defb8460881cbf0a5890bc7a63b42c0cfbed721d (patch) | |
| tree | 4cb3d9ddae0a6b0c53e97e1380543dc9926e6106 /fs/nfs/nfs4proc.c | |
| parent | pnfs: don't check sequence on new stateids in layoutget (diff) | |
| download | linux-dev-defb8460881cbf0a5890bc7a63b42c0cfbed721d.tar.xz linux-dev-defb8460881cbf0a5890bc7a63b42c0cfbed721d.zip | |
pnfs: retry after a bad stateid error from layoutget
Currently we fall through to nfs4_async_handle_error when we get
a bad stateid error back from layoutget. nfs4_async_handle_error
with a NULL state argument will never retry the operations but return
the error to higher layer, causing an avoiable fallback to MDS I/O.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/nfs4proc.c')
| -rw-r--r-- | fs/nfs/nfs4proc.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 18eb31c1ea0b..47fa67a3a8cf 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -7577,11 +7577,16 @@ static void nfs4_layoutget_done(struct rpc_task *task, void *calldata) } else { LIST_HEAD(head); + /* + * Mark the bad layout state as invalid, then retry + * with the current stateid. + */ 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); + + task->tk_status = 0; + rpc_restart_call_prepare(task); } } if (nfs4_async_handle_error(task, server, state) == -EAGAIN) |