From: Christoph Hellwig Date: Thu, 21 Aug 2014 16:09:21 +0000 (-0500) Subject: pnfs: retry after a bad stateid error from layoutget X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=defb8460881cbf0a5890bc7a63b42c0cfbed721d;hp=362f74745c15fb9acad577ab8e1342ee5313a2a5;p=deliverable%2Flinux.git 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 Signed-off-by: Trond Myklebust --- 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)