From: Trond Myklebust <trond.myklebust@primarydata.com>
To: anna.schumaker@netapp.com
Cc: linux-nfs@vger.kernel.org, Oleg Drokin <green@linuxhacker.ru>
Subject: [PATCH v4 14/20] NFSv4: nfs4_do_handle_exception() handle revoke/expiry of a single stateid
Date: Thu, 15 Sep 2016 12:45:54 -0400 [thread overview]
Message-ID: <1473957960-10001-15-git-send-email-trond.myklebust@primarydata.com> (raw)
In-Reply-To: <1473957960-10001-14-git-send-email-trond.myklebust@primarydata.com>
If we're not yet sure that all state has expired or been revoked, we
should try to do a minimal recovery on just the one stateid.
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---
fs/nfs/nfs4proc.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index f79d4f55d83f..84ee836a976c 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -400,10 +400,16 @@ static int nfs4_do_handle_exception(struct nfs_server *server,
switch(errorcode) {
case 0:
return 0;
- case -NFS4ERR_OPENMODE:
case -NFS4ERR_DELEG_REVOKED:
case -NFS4ERR_ADMIN_REVOKED:
+ case -NFS4ERR_EXPIRED:
case -NFS4ERR_BAD_STATEID:
+ if (inode != NULL && stateid != NULL) {
+ nfs_inode_find_delegation_state_and_recover(inode,
+ stateid);
+ goto wait_on_recovery;
+ }
+ case -NFS4ERR_OPENMODE:
if (inode) {
int err;
@@ -422,12 +428,6 @@ static int nfs4_do_handle_exception(struct nfs_server *server,
if (ret < 0)
break;
goto wait_on_recovery;
- case -NFS4ERR_EXPIRED:
- if (state != NULL) {
- ret = nfs4_schedule_stateid_recovery(server, state);
- if (ret < 0)
- break;
- }
case -NFS4ERR_STALE_STATEID:
case -NFS4ERR_STALE_CLIENTID:
nfs4_schedule_lease_recovery(clp);
--
2.7.4
next prev parent reply other threads:[~2016-09-15 16:46 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-15 16:45 [PATCH v4 00/20] Fix delegation behaviour when server revokes some state Trond Myklebust
2016-09-15 16:45 ` [PATCH v4 01/20] NFSv4.1: Don't deadlock the state manager on the SEQUENCE status flags Trond Myklebust
2016-09-15 16:45 ` [PATCH v4 02/20] NFSv4.1: Don't check delegations that are already marked as revoked Trond Myklebust
2016-09-15 16:45 ` [PATCH v4 03/20] NFSv4.1: Allow test_stateid to handle session errors without waiting Trond Myklebust
2016-09-15 16:45 ` [PATCH v4 04/20] NFSv4.1: Add a helper function to deal with expired stateids Trond Myklebust
2016-09-15 16:45 ` [PATCH v4 05/20] NFSv4.x: Allow callers of nfs_remove_bad_delegation() to specify a stateid Trond Myklebust
2016-09-15 16:45 ` [PATCH v4 06/20] NFSv4.1: Test delegation stateids when server declares "some state revoked" Trond Myklebust
2016-09-15 16:45 ` [PATCH v4 07/20] NFSv4.1: Deal with server reboots during delegation expiration recovery Trond Myklebust
2016-09-15 16:45 ` [PATCH v4 08/20] NFSv4.1: Don't recheck delegations that have already been checked Trond Myklebust
2016-09-15 16:45 ` [PATCH v4 09/20] NFSv4.1: Allow revoked stateids to skip the call to TEST_STATEID Trond Myklebust
2016-09-15 16:45 ` [PATCH v4 10/20] NFSv4.1: Ensure we always run TEST/FREE_STATEID on locks Trond Myklebust
2016-09-15 16:45 ` [PATCH v4 11/20] NFSv4.1: FREE_STATEID can be asynchronous Trond Myklebust
2016-09-15 16:45 ` [PATCH v4 12/20] NFSv4.1: Ensure we call FREE_STATEID if needed on close/delegreturn/locku Trond Myklebust
2016-09-15 16:45 ` [PATCH v4 13/20] NFSv4: nfs_inode_find_delegation_state_and_recover() should check all stateids Trond Myklebust
2016-09-15 16:45 ` Trond Myklebust [this message]
2016-09-15 16:45 ` [PATCH v4 15/20] NFSv4: nfs4_handle_delegation_recall_error() handle expiration as revoke case Trond Myklebust
2016-09-15 16:45 ` [PATCH v4 16/20] NFSv4: nfs4_handle_setlk_error() " Trond Myklebust
2016-09-15 16:45 ` [PATCH v4 17/20] NFSv4.1: nfs4_layoutget_handle_exception handle revoked state Trond Myklebust
2016-09-15 16:45 ` [PATCH v4 18/20] NFSv4: Pass the stateid to the exception handler in nfs4_read/write_done_cb Trond Myklebust
2016-09-15 16:45 ` [PATCH v4 19/20] NFSv4: Fix a race in nfs_inode_reclaim_delegation() Trond Myklebust
2016-09-15 16:46 ` [PATCH v4 20/20] NFSv4: Fix a race when updating an open_stateid Trond Myklebust
2016-09-15 22:17 ` kbuild test robot
2016-09-16 4:38 ` [PATCH v4 00/20] Fix delegation behaviour when server revokes some state Oleg Drokin
2016-09-16 15:36 ` Trond Myklebust
2016-09-16 21:15 ` Oleg Drokin
2016-09-16 21:21 ` Oleg Drokin
2016-09-16 21:28 ` Trond Myklebust
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=1473957960-10001-15-git-send-email-trond.myklebust@primarydata.com \
--to=trond.myklebust@primarydata.com \
--cc=anna.schumaker@netapp.com \
--cc=green@linuxhacker.ru \
--cc=linux-nfs@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).