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 v5 06/25] NFSv4.x: Allow callers of nfs_remove_bad_delegation() to specify a stateid
Date: Sat, 17 Sep 2016 01:13:14 -0400 [thread overview]
Message-ID: <1474089213-104014-7-git-send-email-trond.myklebust@primarydata.com> (raw)
In-Reply-To: <1474089213-104014-6-git-send-email-trond.myklebust@primarydata.com>
Allow the callers of nfs_remove_bad_delegation() to specify the stateid
that needs to be marked as bad.
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---
fs/nfs/delegation.c | 30 +++++++++++++++++++++++-------
fs/nfs/delegation.h | 2 +-
fs/nfs/flexfilelayout/flexfilelayout.c | 2 +-
fs/nfs/nfs4proc.c | 14 ++++++++------
4 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c
index 86d2c748140b..32fff8985a29 100644
--- a/fs/nfs/delegation.c
+++ b/fs/nfs/delegation.c
@@ -643,23 +643,39 @@ static void nfs_client_mark_return_unused_delegation_types(struct nfs_client *cl
rcu_read_unlock();
}
-static void nfs_revoke_delegation(struct inode *inode)
+static void nfs_mark_delegation_revoked(struct nfs_server *server,
+ struct nfs_delegation *delegation)
+{
+ set_bit(NFS_DELEGATION_REVOKED, &delegation->flags);
+ nfs_mark_return_delegation(server, delegation);
+}
+
+static bool nfs_revoke_delegation(struct inode *inode,
+ const nfs4_stateid *stateid)
{
struct nfs_delegation *delegation;
+ bool ret = false;
+
rcu_read_lock();
delegation = rcu_dereference(NFS_I(inode)->delegation);
- if (delegation != NULL) {
- set_bit(NFS_DELEGATION_REVOKED, &delegation->flags);
- nfs_mark_return_delegation(NFS_SERVER(inode), delegation);
- }
+ if (delegation == NULL)
+ goto out;
+ if (stateid && !nfs4_stateid_match(stateid, &delegation->stateid))
+ goto out;
+ nfs_mark_delegation_revoked(NFS_SERVER(inode), delegation);
+ ret = true;
+out:
rcu_read_unlock();
+ return ret;
}
-void nfs_remove_bad_delegation(struct inode *inode)
+void nfs_remove_bad_delegation(struct inode *inode,
+ const nfs4_stateid *stateid)
{
struct nfs_delegation *delegation;
- nfs_revoke_delegation(inode);
+ if (!nfs_revoke_delegation(inode, stateid))
+ return;
delegation = nfs_inode_detach_delegation(inode);
if (delegation) {
nfs_inode_find_state_and_recover(inode, &delegation->stateid);
diff --git a/fs/nfs/delegation.h b/fs/nfs/delegation.h
index 64724d252a79..d40827af5913 100644
--- a/fs/nfs/delegation.h
+++ b/fs/nfs/delegation.h
@@ -47,7 +47,7 @@ void nfs_expire_unused_delegation_types(struct nfs_client *clp, fmode_t flags);
void nfs_expire_unreferenced_delegations(struct nfs_client *clp);
int nfs_client_return_marked_delegations(struct nfs_client *clp);
int nfs_delegations_present(struct nfs_client *clp);
-void nfs_remove_bad_delegation(struct inode *inode);
+void nfs_remove_bad_delegation(struct inode *inode, const nfs4_stateid *stateid);
void nfs_delegation_mark_reclaim(struct nfs_client *clp);
void nfs_delegation_reap_unclaimed(struct nfs_client *clp);
diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c
index 51b51369704c..98ace127bf86 100644
--- a/fs/nfs/flexfilelayout/flexfilelayout.c
+++ b/fs/nfs/flexfilelayout/flexfilelayout.c
@@ -1080,7 +1080,7 @@ static int ff_layout_async_handle_error_v4(struct rpc_task *task,
case -NFS4ERR_BAD_STATEID:
if (state == NULL)
break;
- nfs_remove_bad_delegation(state->inode);
+ nfs_remove_bad_delegation(state->inode, NULL);
case -NFS4ERR_OPENMODE:
if (state == NULL)
break;
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 0ade81441ac2..9c203c221876 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2385,9 +2385,10 @@ static int nfs4_open_expired(struct nfs4_state_owner *sp, struct nfs4_state *sta
return ret;
}
-static void nfs_finish_clear_delegation_stateid(struct nfs4_state *state)
+static void nfs_finish_clear_delegation_stateid(struct nfs4_state *state,
+ const nfs4_stateid *stateid)
{
- nfs_remove_bad_delegation(state->inode);
+ nfs_remove_bad_delegation(state->inode, stateid);
write_seqlock(&state->seqlock);
nfs4_stateid_copy(&state->stateid, &state->open_stateid);
write_sequnlock(&state->seqlock);
@@ -2397,7 +2398,7 @@ static void nfs_finish_clear_delegation_stateid(struct nfs4_state *state)
static void nfs40_clear_delegation_stateid(struct nfs4_state *state)
{
if (rcu_access_pointer(NFS_I(state->inode)->delegation) != NULL)
- nfs_finish_clear_delegation_stateid(state);
+ nfs_finish_clear_delegation_stateid(state, NULL);
}
static int nfs40_open_expired(struct nfs4_state_owner *sp, struct nfs4_state *state)
@@ -2443,19 +2444,20 @@ static void nfs41_check_delegation_stateid(struct nfs4_state *state)
rcu_read_unlock();
return;
}
+
+ nfs4_stateid_copy(&stateid, &delegation->stateid);
if (test_bit(NFS_DELEGATION_REVOKED, &delegation->flags)) {
rcu_read_unlock();
- nfs_finish_clear_delegation_stateid(state);
+ nfs_finish_clear_delegation_stateid(state, &stateid);
return;
}
- nfs4_stateid_copy(&stateid, &delegation->stateid);
cred = get_rpccred(delegation->cred);
rcu_read_unlock();
status = nfs41_test_and_free_expired_stateid(server, &stateid, cred);
trace_nfs4_test_delegation_stateid(state, NULL, status);
if (status != NFS_OK)
- nfs_finish_clear_delegation_stateid(state);
+ nfs_finish_clear_delegation_stateid(state, &stateid);
put_rpccred(cred);
}
--
2.7.4
next prev parent reply other threads:[~2016-09-17 5:13 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-17 5:13 [PATCH v5 00/25] Fix delegation behaviour when server revokes some state Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 01/25] NFSv4.1: Don't deadlock the state manager on the SEQUENCE status flags Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 02/25] NFSv4: Don't report revoked delegations as valid in nfs_have_delegation() Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 03/25] NFSv4.1: Don't check delegations that are already marked as revoked Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 04/25] NFSv4.1: Allow test_stateid to handle session errors without waiting Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 05/25] NFSv4.1: Add a helper function to deal with expired stateids Trond Myklebust
2016-09-17 5:13 ` Trond Myklebust [this message]
2016-09-17 5:13 ` [PATCH v5 07/25] NFSv4.1: Test delegation stateids when server declares "some state revoked" Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 08/25] NFSv4.1: Deal with server reboots during delegation expiration recovery Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 09/25] NFSv4.1: Don't recheck delegations that have already been checked Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 10/25] NFSv4.1: Allow revoked stateids to skip the call to TEST_STATEID Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 11/25] NFSv4.1: Ensure we always run TEST/FREE_STATEID on locks Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 12/25] NFSv4.1: FREE_STATEID can be asynchronous Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 13/25] NFSv4.1: Ensure we call FREE_STATEID if needed on close/delegreturn/locku Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 14/25] NFSv4: Ensure we don't re-test revoked and freed stateids Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 15/25] NFSv4: nfs_inode_find_delegation_state_and_recover() should check all stateids Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 16/25] NFSv4: nfs4_do_handle_exception() handle revoke/expiry of a single stateid Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 17/25] NFSv4: nfs4_handle_delegation_recall_error() handle expiration as revoke case Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 18/25] NFSv4: nfs4_handle_setlk_error() " Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 19/25] NFSv4.1: nfs4_layoutget_handle_exception handle revoked state Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 20/25] NFSv4: Pass the stateid to the exception handler in nfs4_read/write_done_cb Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 21/25] NFSv4: Fix a race in nfs_inode_reclaim_delegation() Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 22/25] NFSv4: Fix a race when updating an open_stateid Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 23/25] NFS: Always call nfs_inode_find_state_and_recover() when revoking a delegation Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 24/25] NFSv4: Don't test open_stateid unless it is set Trond Myklebust
2016-09-17 5:13 ` [PATCH v5 25/25] NFSv4: Mark the lock and open stateids as invalid after freeing them Trond Myklebust
2016-09-17 18:04 ` [PATCH v5 00/25] Fix delegation behaviour when server revokes some state Oleg Drokin
2016-09-17 18:18 ` Trond Myklebust
2016-09-17 19:16 ` Oleg Drokin
2016-09-17 19:32 ` Trond Myklebust
2016-09-17 21:45 ` Trond Myklebust
2016-09-17 21:55 ` Oleg Drokin
2016-09-17 21:59 ` Trond Myklebust
2016-09-18 1:19 ` Oleg Drokin
2016-09-18 16:23 ` Oleg Drokin
2016-09-18 22:38 ` Trond Myklebust
2016-09-18 22:44 ` Oleg Drokin
2016-09-18 23:08 ` Trond Myklebust
2016-09-18 23:30 ` Oleg Drokin
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=1474089213-104014-7-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).