diff mbox series

[18/20] __d_unalias() doesn't use inode argument

Message ID	20231124060644.576611-18-viro@zeniv.linux.org.uk (mailing list archive)
State	New, archived
Headers	show Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linux.org.uk header.i=@linux.org.uk header.b="Bv6kmSv4" From: Al Viro <viro@zeniv.linux.org.uk> To: linux-fsdevel@vger.kernel.org Cc: Linus Torvalds <torvalds@linux-foundation.org>, Christian Brauner <brauner@kernel.org>, linux-kernel@vger.kernel.org Subject: [PATCH 18/20] __d_unalias() doesn't use inode argument Date: Fri, 24 Nov 2023 06:06:42 +0000 Message-Id: <20231124060644.576611-18-viro@zeniv.linux.org.uk> In-Reply-To: <20231124060644.576611-1-viro@zeniv.linux.org.uk> References: <20231124060553.GA575483@ZenIV> <20231124060644.576611-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/20] selinux: saner handling of policy reloads \| expand [01/20] selinux: saner handling of policy reloads [02/20] ovl: stop using d_alloc_anon()/d_instantiate_anon() [03/20] struct dentry: get rid of randomize_layout idiocy [04/20] get rid of __dget() [05/20] DCACHE_... ->d_flags bits: switch to BIT() [06/20] DCACHE_COOKIE: RIP [07/20] kill d_{is,set}_fallthru() [08/20] dentry.h: trim externs [09/20,software,coproarchaeology] dentry.h: kill a mysterious comment [10/20] kill d_backing_dentry() [11/20] kill d_instantate_anon(), fold __d_instantiate_anon() into remaining caller [12/20] d_alloc_pseudo(): move setting ->d_op there from the (sole) caller [13/20] nsfs: use d_make_root() [14/20] simple_fill_super(): don't bother with d_genocide() on failure [15/20] d_genocide(): move the extern into fs/internal.h [16/20] get rid of DCACHE_GENOCIDE [17/20] d_alloc_parallel(): in-lookup hash insertion doesn't need an RCU variant [18/20] __d_unalias() doesn't use inode argument [19/20] kill DCACHE_MAY_FREE [20/20] dcache: remove unnecessary NULL check in dget_dlock()

Commit Message

Al Viro Nov. 24, 2023, 6:06 a.m. UTC

... and hasn't since 2015.

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

diff mbox series

Patch

diff --git a/fs/dcache.c b/fs/dcache.c
index 51e2f777a2c5..b8f502a66e53 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -3043,8 +3043,7 @@  struct dentry *d_ancestor(struct dentry *p1, struct dentry *p2)
  * Note: If ever the locking in lock_rename() changes, then please
  * remember to update this too...
  */
-static int __d_unalias(struct inode *inode,
-		struct dentry *dentry, struct dentry *alias)
+static int __d_unalias(struct dentry *dentry, struct dentry *alias)
 {
 	struct mutex *m1 = NULL;
 	struct rw_semaphore *m2 = NULL;
@@ -3125,7 +3124,7 @@  struct dentry *d_splice_alias(struct inode *inode, struct dentry *dentry)
 					inode->i_sb->s_id);
 			} else if (!IS_ROOT(new)) {
 				struct dentry *old_parent = dget(new->d_parent);
-				int err = __d_unalias(inode, dentry, new);
+				int err = __d_unalias(dentry, new);
 				write_sequnlock(&rename_lock);
 				if (err) {
 					dput(new);