linux-kernel - linux-next: manual merge of the vfs tree with the f2fs tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20231220104734.0979a9f8@canb.auug.org.au>
Date: Wed, 20 Dec 2023 10:47:34 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Al Viro <viro@...IV.linux.org.uk>, Jaegeuk Kim <jaegeuk@...nel.org>
Cc: Chao Yu <chao@...nel.org>, Jan Kara <jack@...e.cz>, Linux Kernel Mailing
 List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the vfs tree with the f2fs tree

Hi all,

Today's linux-next merge of the vfs tree got a conflict in:

  fs/f2fs/namei.c

between commit:

  53edb549565f ("f2fs: fix to avoid dirent corruption")

from the f2fs tree and commit:

  7deee77b993a ("f2fs: Avoid reading renamed directory if parent does not change")

from the vfs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/f2fs/namei.c
index ede6afb81762,fdc97df6bb85..000000000000
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@@ -1104,8 -1106,8 +1105,8 @@@ static int f2fs_rename(struct mnt_idma
  		iput(whiteout);
  	}
  
- 	if (old_dir_entry) {
- 		if (old_dir != new_dir)
+ 	if (old_is_dir) {
 -		if (old_dir_entry && !whiteout)
++		if (old_dir_entry)
  			f2fs_set_link(old_inode, old_dir_entry,
  						old_dir_page, new_dir);
  		else

Content of type "application/pgp-signature" skipped