From: Ricardo Labiaga <Ricardo.Labiaga@netapp.com>
To: trond.myklebust@netapp.com
Cc: linux-nfs@vger.kernel.org, Ricardo Labiaga <Ricardo.Labiaga@netapp.com>
Subject: [PATCH 3/3] nfs41: Retry delegation return if it failed with session error
Date: Sat, 5 Dec 2009 12:11:24 -0800 [thread overview]
Message-ID: <1260043884-16267-4-git-send-email-Ricardo.Labiaga@netapp.com> (raw)
In-Reply-To: <1260043884-16267-3-git-send-email-Ricardo.Labiaga@netapp.com>
Update nfs4_delegreturn_done() to retry the operation after setting the
NFS4CLNT_SESSION_SETUP bit to indicate the need to reset the session.
Signed-off-by: Ricardo Labiaga <Ricardo.Labiaga@netapp.com>
---
fs/nfs/nfs4proc.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 97d4a82..25f4180 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -3484,9 +3484,18 @@ static void nfs4_delegreturn_done(struct rpc_task *task, void *calldata)
nfs4_sequence_done_free_slot(data->res.server, &data->res.seq_res,
task->tk_status);
- data->rpc_status = task->tk_status;
- if (data->rpc_status == 0)
+ switch (task->tk_status) {
+ case -NFS4ERR_STALE_STATEID:
+ case -NFS4ERR_EXPIRED:
+ case 0:
renew_lease(data->res.server, data->timestamp);
+ break;
+ default:
+ if (nfs4_async_handle_error(task, data->res.server, NULL) ==
+ -EAGAIN)
+ nfs4_restart_rpc(task, data->res.server->nfs_client);
+ }
+ data->rpc_status = task->tk_status;
}
static void nfs4_delegreturn_release(void *calldata)
--
1.5.4.3
next prev parent reply other threads:[~2009-12-05 20:17 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-05 20:11 [Patch 0/3] Reclaim State Bug Fixes Ricardo Labiaga
2009-12-05 20:11 ` [PATCH 1/3] nfs41: Mark stateids in need of reclaim if state manager gets stale clientid Ricardo Labiaga
2009-12-05 20:11 ` [PATCH 2/3] nfs41: Handle session errors during delegation return Ricardo Labiaga
2009-12-05 20:11 ` Ricardo Labiaga [this message]
2009-12-05 20:39 ` [PATCH 3/3] nfs41: Retry delegation return if it failed with session error Trond Myklebust
2009-12-05 20:38 ` [PATCH 2/3] nfs41: Handle session errors during delegation return Trond Myklebust
2009-12-05 21:58 ` Labiaga, Ricardo
2009-12-05 20:34 ` [PATCH 1/3] nfs41: Mark stateids in need of reclaim if state manager gets stale clientid Trond Myklebust
2009-12-05 21:12 ` Labiaga, Ricardo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1260043884-16267-4-git-send-email-Ricardo.Labiaga@netapp.com \
--to=ricardo.labiaga@netapp.com \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@netapp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox