From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Al Viro <viro@ZenIV•linux.org.uk>, Jaegeuk Kim <jaegeuk@kernel•org>
Cc: Chao Yu <chao@kernel•org>, Jan Kara <jack@suse•cz>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the vfs tree with the f2fs tree
Date: Wed, 20 Dec 2023 11:13:25 +1100 [thread overview]
Message-ID: <20231220111325.5dd55e47@canb.auug.org.au> (raw)
In-Reply-To: <20231220104734.0979a9f8@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1536 bytes --]
Hi Al,
On Wed, 20 Dec 2023 10:47:34 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> 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.
Then I remembered to look at your suggested resolution and redid it
like you did (see below).
--
Cheers,
Stephen Rothwell
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@@ -1104,12 -1106,12 +1105,9 @@@ static int f2fs_rename(struct mnt_idma
iput(whiteout);
}
- if (old_is_dir) {
- if (old_dir_entry && !whiteout)
- f2fs_set_link(old_inode, old_dir_entry,
+ if (old_dir_entry) {
- if (old_dir != new_dir)
- f2fs_set_link(old_inode, old_dir_entry,
++ f2fs_set_link(old_inode, old_dir_entry,
old_dir_page, new_dir);
-- else
-- f2fs_put_page(old_dir_page, 0);
f2fs_i_links_write(old_dir, false);
}
if (F2FS_OPTION(sbi).fsync_mode == FSYNC_MODE_STRICT) {
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-12-20 0:13 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-19 23:47 linux-next: manual merge of the vfs tree with the f2fs tree Stephen Rothwell
2023-12-20 0:13 ` Stephen Rothwell [this message]
2023-12-20 1:34 ` Al Viro
2023-12-20 3:05 ` Stephen Rothwell
2023-12-20 4:44 ` Al Viro
-- strict thread matches above, loose matches on Subject: below --
2021-04-19 0:53 Stephen Rothwell
2018-10-03 0:12 Stephen Rothwell
2017-11-08 23:06 Stephen Rothwell
2017-11-08 23:01 Stephen Rothwell
2017-02-27 0:05 Stephen Rothwell
2017-02-27 8:27 ` David Howells
2016-07-25 0:21 Stephen Rothwell
2016-05-03 1:41 Stephen Rothwell
2015-05-07 2:05 Stephen Rothwell
2015-04-13 1:53 Stephen Rothwell
2014-06-10 1:23 Stephen Rothwell
2014-04-29 0:37 Stephen Rothwell
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=20231220111325.5dd55e47@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=chao@kernel$(echo .)org \
--cc=jack@suse$(echo .)cz \
--cc=jaegeuk@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=viro@ZenIV$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox