From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jaegeuk Kim <jaegeuk@kernel•org>
Cc: Christian Brauner <brauner@kernel•org>, Chao Yu <chao@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
"Matthew Wilcox (Oracle)" <willy@infradead•org>
Subject: Re: linux-next: manual merge of the vfs-brauner tree with the f2fs tree
Date: Tue, 17 Sep 2024 08:24:59 +1000 [thread overview]
Message-ID: <20240917082459.0f9f3dee@canb.auug.org.au> (raw)
In-Reply-To: <20240905101845.0a47926a@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2741 bytes --]
Hi all,
On Thu, 5 Sep 2024 10:18:45 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> On Mon, 2 Sep 2024 09:24:05 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >
> > Today's linux-next merge of the vfs-brauner tree got a conflict in:
> >
> > fs/f2fs/data.c
> >
> > between commits:
> >
> > f13c7184e62e ("f2fs: convert f2fs_write_begin() to use folio")
> > 357dd8479f8b ("f2fs: convert f2fs_write_end() to use folio")
> > (and maybe others)
> >
> > from the f2fs tree and commits:
> >
> > a0f858d450ce ("f2fs: Convert f2fs_write_end() to use a folio")
> > dfd2e81d37e1 ("f2fs: Convert f2fs_write_begin() to use a folio")
> > a225800f322a ("fs: Convert aops->write_end to take a folio")
> > 1da86618bdce ("fs: Convert aops->write_begin to take a folio")
> >
> > from the vfs-brauner tree.
> >
> > This was too much for me to fix up, so I just used the f2fs tree from
> > next-20240830 for today. Please discuss this and fix things up.
>
> I took another shot at this and *I think* I figured it out - see below
> and I have also attached the final version of this file. Please check
> and advise.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc fs/f2fs/data.c
> index c6d688208f8b,5dfa0207ad8f..000000000000
> --- a/fs/f2fs/data.c
> +++ b/fs/f2fs/data.c
> @@@ -3626,17 -3617,16 +3627,16 @@@ repeat
>
> /* TODO: cluster can be compressed due to race with .writepage */
>
> - *pagep = page;
> - folio = page_folio(page);
> + *foliop = folio;
>
> if (f2fs_is_atomic_file(inode))
> - err = prepare_atomic_write_begin(sbi, &folio->page, pos, len,
> + err = prepare_atomic_write_begin(sbi, folio, pos, len,
> &blkaddr, &need_balance, &use_cow);
> else
> - err = prepare_write_begin(sbi, &folio->page, pos, len,
> + err = prepare_write_begin(sbi, folio, pos, len,
> &blkaddr, &need_balance);
> if (err)
> - goto fail;
> + goto put_folio;
>
> if (need_balance && !IS_NOQUOTA(inode) &&
> has_not_enough_free_secs(sbi, 0, 0)) {
> @@@ -3668,13 -3659,13 +3669,13 @@@
> if (!f2fs_is_valid_blkaddr(sbi, blkaddr,
> DATA_GENERIC_ENHANCE_READ)) {
> err = -EFSCORRUPTED;
> - goto fail;
> + goto put_folio;
> }
> err = f2fs_submit_page_read(use_cow ?
> - F2FS_I(inode)->cow_inode : inode, &folio->page,
> - blkaddr, 0, true);
> + F2FS_I(inode)->cow_inode : inode,
> + folio, blkaddr, 0, true);
> if (err)
> - goto fail;
> + goto put_folio;
>
> folio_lock(folio);
> if (unlikely(folio->mapping != mapping)) {
This is now a conflict between the f2fs tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2024-09-16 22:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-01 23:24 linux-next: manual merge of the vfs-brauner tree with the f2fs tree Stephen Rothwell
2024-09-05 0:18 ` Stephen Rothwell
2024-09-05 4:00 ` Chao Yu
2024-09-16 22:24 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-07-13 22:25 Stephen Rothwell
2024-02-28 23:41 Stephen Rothwell
2024-02-29 17:13 ` Jaegeuk Kim
2024-03-05 0:35 ` Stephen Rothwell
2024-03-05 0:40 ` Jaegeuk Kim
2024-03-12 4:02 ` Stephen Rothwell
2023-08-15 1:33 Stephen Rothwell
2023-08-15 1:30 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=20240917082459.0f9f3dee@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=brauner@kernel$(echo .)org \
--cc=chao@kernel$(echo .)org \
--cc=jaegeuk@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=willy@infradead$(echo .)org \
/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