This is a note to let you know that I've just added the patch titled
fs: no need to check source
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
fs-no-need-to-check-source.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 66d8fc0539b0d49941f313c9509a8384e4245ac1 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@xxxxxxx>
Date: Mon, 3 Jul 2023 16:49:11 +0200
Subject: fs: no need to check source
From: Jan Kara <jack@xxxxxxx>
commit 66d8fc0539b0d49941f313c9509a8384e4245ac1 upstream.
The @source inode must be valid. It is even checked via IS_SWAPFILE()
above making it pretty clear. So no need to check it when we unlock.
What doesn't need to exist is the @target inode. The lock_two_inodes()
helper currently swaps the @inode1 and @inode2 arguments if @inode1 is
NULL to have consistent lock class usage. However, we know that at least
for vfs_rename() that @inode1 is @source and thus is never NULL as per
above. We also know that @source is a different inode than @target as
that is checked right at the beginning of vfs_rename(). So we know that
@source is valid and locked and that @target is locked. So drop the
check whether @source is non-NULL.
Fixes: 28eceeda130f ("fs: Lock moved directories")
Reported-by: kernel test robot <lkp@xxxxxxxxx>
Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Closes: https://lore.kernel.org/r/202307030026.9sE2pk2x-lkp@xxxxxxxxx
Message-Id: <20230703-vfs-rename-source-v1-1-37eebb29b65b@xxxxxxxxxx>
[brauner: use commit message from patch I sent concurrently]
Signed-off-by: Christian Brauner <brauner@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/namei.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -4497,8 +4497,7 @@ int vfs_rename(struct inode *old_dir, st
d_exchange(old_dentry, new_dentry);
}
out:
- if (source)
- inode_unlock(source);
+ inode_unlock(source);
if (target)
inode_unlock(target);
dput(new_dentry);
Patches currently in stable-queue which might be from jack@xxxxxxx are
queue-5.4/fs-lock-moved-directories.patch
queue-5.4/fs-establish-locking-order-for-unrelated-directories.patch
queue-5.4/fs-no-need-to-check-source.patch
queue-5.4/revert-f2fs-fix-potential-corruption-when-moving-a-directory.patch
queue-5.4/ext4-remove-ext4-locking-of-moved-directory.patch
