diff mbox series

[06/22] get rid of __dget()

Message ID	20231109062056.3181775-6-viro@zeniv.linux.org.uk (mailing list archive)
State	New, archived
Headers	show Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 53430D308 for <linux-fsdevel@vger.kernel.org>; Thu, 9 Nov 2023 06:20:59 +0000 (UTC) From: Al Viro <viro@zeniv.linux.org.uk> To: Linus Torvalds <torvalds@linux-foundation.org> Cc: linux-fsdevel@vger.kernel.org, Christian Brauner <brauner@kernel.org> Subject: [PATCH 06/22] get rid of __dget() Date: Thu, 9 Nov 2023 06:20:40 +0000 Message-Id: <20231109062056.3181775-6-viro@zeniv.linux.org.uk> In-Reply-To: <20231109062056.3181775-1-viro@zeniv.linux.org.uk> References: <20231109061932.GA3181489@ZenIV> <20231109062056.3181775-1-viro@zeniv.linux.org.uk> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Al Viro <viro@ftp.linux.org.uk>
Series	[01/22] struct dentry: get rid of randomize_layout idiocy \| expand [01/22] struct dentry: get rid of randomize_layout idiocy [02/22] switch nfsd_client_rmdir() to use of simple_recursive_removal() [03/22] coda_flag_children(): cope with dentries turning negative [04/22] dentry: switch the lists of children to hlist [05/22] centralize killing dentry from shrink list [06/22] get rid of __dget() [07/22] shrink_dentry_list(): no need to check that dentry refcount is marked dead [08/22] fast_dput(): having ->d_delete() is not reason to delay refcount decrement [09/22] fast_dput(): handle underflows gracefully [10/22] fast_dput(): new rules for refcount [11/22] __dput_to_list(): do decrement of refcount in the callers [12/22] Make retain_dentry() neutral with respect to refcounting [13/22] __dentry_kill(): get consistent rules for victim's refcount [14/22] dentry_kill(): don't bother with retain_dentry() on slow path [15/22] Call retain_dentry() with refcount 0 [16/22] fold the call of retain_dentry() into fast_dput() [17/22] don't try to cut corners in shrink_lock_dentry() [18/22] fold dentry_kill() into dput() [19/22] to_shrink_list(): call only if refcount is 0 [20/22] switch select_collect{,2}() to use of to_shrink_list() [21/22] d_prune_aliases(): use a shrink list [22/22] __dentry_kill(): new locking scheme

Commit Message

Al Viro Nov. 9, 2023, 6:20 a.m. UTC

fold into the sole remaining caller

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
 fs/dcache.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Comments

Christian Brauner Nov. 9, 2023, 1:50 p.m. UTC | #1

On Thu, Nov 09, 2023 at 06:20:40AM +0000, Al Viro wrote:
> fold into the sole remaining caller
> 
> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
> ---

Reviewed-by: Christian Brauner <brauner@kernel.org>

diff mbox series

Patch

diff --git a/fs/dcache.c b/fs/dcache.c
index 56af55f2b7d9..1476f2d6e9ea 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -948,11 +948,6 @@  static inline void __dget_dlock(struct dentry *dentry)
 	dentry->d_lockref.count++;
 }
 
-static inline void __dget(struct dentry *dentry)
-{
-	lockref_get(&dentry->d_lockref);
-}
-
 struct dentry *dget_parent(struct dentry *dentry)
 {
 	int gotref;
@@ -1002,7 +997,7 @@  static struct dentry * __d_find_any_alias(struct inode *inode)
 	if (hlist_empty(&inode->i_dentry))
 		return NULL;
 	alias = hlist_entry(inode->i_dentry.first, struct dentry, d_u.d_alias);
-	__dget(alias);
+	lockref_get(&alias->d_lockref);
 	return alias;
 }