All of lore.kernel.org
 help / color / mirror / Atom feed
From: Trond Myklebust <trondmy@gmail.com>
To: linux-nfs@vger.kernel.org
Subject: [PATCH v2 07/20] NFS: Rename nfs_inode_return_delegation_noreclaim()
Date: Thu, 31 Oct 2019 18:40:38 -0400	[thread overview]
Message-ID: <20191031224051.8923-8-trond.myklebust@hammerspace.com> (raw)
In-Reply-To: <20191031224051.8923-7-trond.myklebust@hammerspace.com>

Rename nfs_inode_return_delegation_noreclaim() to
nfs_inode_evict_delegation(), which better describes what it
does.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
---
 fs/nfs/delegation.c | 11 +++++++----
 fs/nfs/delegation.h |  2 +-
 fs/nfs/nfs4super.c  |  4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c
index 630167e243be..0c9339d559f5 100644
--- a/fs/nfs/delegation.c
+++ b/fs/nfs/delegation.c
@@ -585,19 +585,22 @@ int nfs_client_return_marked_delegations(struct nfs_client *clp)
 }
 
 /**
- * nfs_inode_return_delegation_noreclaim - return delegation, don't reclaim opens
+ * nfs_inode_evict_delegation - return delegation, don't reclaim opens
  * @inode: inode to process
  *
  * Does not protect against delegation reclaims, therefore really only safe
- * to be called from nfs4_clear_inode().
+ * to be called from nfs4_clear_inode(). Guaranteed to always free
+ * the delegation structure.
  */
-void nfs_inode_return_delegation_noreclaim(struct inode *inode)
+void nfs_inode_evict_delegation(struct inode *inode)
 {
 	struct nfs_delegation *delegation;
 
 	delegation = nfs_inode_detach_delegation(inode);
-	if (delegation != NULL)
+	if (delegation != NULL) {
+		set_bit(NFS_DELEGATION_INODE_FREEING, &delegation->flags);
 		nfs_do_return_delegation(inode, delegation, 1);
+	}
 }
 
 /**
diff --git a/fs/nfs/delegation.h b/fs/nfs/delegation.h
index 8b14d441e699..74b7fb601365 100644
--- a/fs/nfs/delegation.h
+++ b/fs/nfs/delegation.h
@@ -43,7 +43,7 @@ void nfs_inode_reclaim_delegation(struct inode *inode, const struct cred *cred,
 		fmode_t type, const nfs4_stateid *stateid, unsigned long pagemod_limit);
 int nfs4_inode_return_delegation(struct inode *inode);
 int nfs_async_inode_return_delegation(struct inode *inode, const nfs4_stateid *stateid);
-void nfs_inode_return_delegation_noreclaim(struct inode *inode);
+void nfs_inode_evict_delegation(struct inode *inode);
 
 struct inode *nfs_delegation_find_inode(struct nfs_client *clp, const struct nfs_fh *fhandle);
 void nfs_server_return_all_delegations(struct nfs_server *);
diff --git a/fs/nfs/nfs4super.c b/fs/nfs/nfs4super.c
index 04c57066a11a..2c9cbade561a 100644
--- a/fs/nfs/nfs4super.c
+++ b/fs/nfs/nfs4super.c
@@ -92,8 +92,8 @@ static void nfs4_evict_inode(struct inode *inode)
 {
 	truncate_inode_pages_final(&inode->i_data);
 	clear_inode(inode);
-	/* If we are holding a delegation, return it! */
-	nfs_inode_return_delegation_noreclaim(inode);
+	/* If we are holding a delegation, return and free it */
+	nfs_inode_evict_delegation(inode);
 	/* Note that above delegreturn would trigger pnfs return-on-close */
 	pnfs_return_layout(inode);
 	pnfs_destroy_layout(NFS_I(inode));
-- 
2.23.0


  reply	other threads:[~2019-10-31 22:43 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-31 22:40 [PATCH v2 00/20] Delegation bugfixes Trond Myklebust
2019-10-31 22:40 ` [PATCH v2 01/20] NFSv4: Don't allow a cached open with a revoked delegation Trond Myklebust
2019-10-31 22:40   ` [PATCH v2 02/20] NFS: Fix an RCU lock leak in nfs4_refresh_delegation_stateid() Trond Myklebust
2019-10-31 22:40     ` [PATCH v2 03/20] NFSv4: Fix delegation handling in update_open_stateid() Trond Myklebust
2019-10-31 22:40       ` [PATCH v2 04/20] NFSv4: nfs4_callback_getattr() should ignore revoked delegations Trond Myklebust
2019-10-31 22:40         ` [PATCH v2 05/20] NFSv4: Delegation recalls should not find " Trond Myklebust
2019-10-31 22:40           ` [PATCH v2 06/20] NFSv4: fail nfs4_refresh_delegation_stateid() when the delegation was revoked Trond Myklebust
2019-10-31 22:40             ` Trond Myklebust [this message]
2019-10-31 22:40               ` [PATCH v2 08/20] NFSv4: Don't remove the delegation from the super_list more than once Trond Myklebust
2019-10-31 22:40                 ` [PATCH v2 09/20] NFSv4: Hold the delegation spinlock when updating the seqid Trond Myklebust
2019-10-31 22:40                   ` [PATCH v2 10/20] NFSv4: Clear the NFS_DELEGATION_REVOKED flag in nfs_update_inplace_delegation() Trond Myklebust
2019-10-31 22:40                     ` [PATCH v2 11/20] NFSv4: Update the stateid seqid in nfs_revoke_delegation() Trond Myklebust
2019-10-31 22:40                       ` [PATCH v2 12/20] NFSv4: Revoke the delegation on success in nfs4_delegreturn_done() Trond Myklebust
2019-10-31 22:40                         ` [PATCH v2 13/20] NFSv4: Ignore requests to return the delegation if it was revoked Trond Myklebust
2019-10-31 22:40                           ` [PATCH v2 14/20] NFSv4: Don't reclaim delegations that have been returned or revoked Trond Myklebust
2019-10-31 22:40                             ` [PATCH v2 15/20] NFSv4: nfs4_return_incompatible_delegation() should check delegation validity Trond Myklebust
2019-10-31 22:40                               ` [PATCH v2 16/20] NFSv4: Fix nfs4_inode_make_writeable() Trond Myklebust
2019-10-31 22:40                                 ` [PATCH v2 17/20] NFS: nfs_inode_find_state_and_recover() fix stateid matching Trond Myklebust
2019-10-31 22:40                                   ` [PATCH v2 18/20] NFSv4: Fix races between open and delegreturn Trond Myklebust
2019-10-31 22:40                                     ` [PATCH v2 19/20] NFSv4: Handle NFS4ERR_OLD_STATEID in delegreturn Trond Myklebust
2019-10-31 22:40                                       ` [PATCH v2 20/20] NFSv4: Don't retry the GETATTR on old stateid in nfs4_delegreturn_done() 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=20191031224051.8923-8-trond.myklebust@hammerspace.com \
    --to=trondmy@gmail.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.