From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Theodore Ts'o <tytso@mit•edu>
Cc: Jens Axboe <axboe@kernel•dk>, Christoph Hellwig <hch@lst•de>,
Jan Kara <jack@suse•cz>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Zhihao Cheng <chengzhihao1@huawei•com>
Subject: Re: linux-next: manual merge of the block tree with the ext4 tree
Date: Tue, 27 Jun 2023 10:46:46 +1000 [thread overview]
Message-ID: <20230627104646.35f4279d@canb.auug.org.au> (raw)
In-Reply-To: <20230626130951.54c4254a@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1703 bytes --]
Hi all,
On Mon, 26 Jun 2023 13:09:51 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the block tree got a conflict in:
>
> fs/ext4/super.c
>
> between commit:
>
> ffea255f4052 ("ext4: Fix reusing stale buffer heads from last failed mounting")
>
> from the ext4 tree and commits:
>
> 2736e8eeb0cc ("block: use the holder as indication for exclusive opens")
> a42fb5a75ccc ("ext4: Fix warning in blkdev_put()")
>
> from the block 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/ext4/super.c
> index b3819e70093e,64342adcd679..000000000000
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@@ -1128,13 -1133,7 +1133,13 @@@ static void ext4_blkdev_remove(struct e
> struct block_device *bdev;
> bdev = sbi->s_journal_bdev;
> if (bdev) {
> + /*
> + * Invalidate the journal device's buffers. We don't want them
> + * floating about in memory - the physical journal device may
> + * hotswapped, and it breaks the `ro-after' testing code.
> + */
> + invalidate_bdev(bdev);
> - ext4_blkdev_put(bdev);
> + blkdev_put(bdev, sbi->s_sb);
> sbi->s_journal_bdev = NULL;
> }
> }
This is now a conflict between the ext4 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:[~2023-06-27 0:46 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-26 3:09 linux-next: manual merge of the block tree with the ext4 tree Stephen Rothwell
2023-06-26 8:00 ` Christoph Hellwig
2023-06-27 0:46 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-06-13 2:54 Stephen Rothwell
2023-06-13 5:00 ` Christoph Hellwig
2016-07-15 4:33 Stephen Rothwell
2014-11-27 3:53 Stephen Rothwell
2014-11-27 7:38 ` Christoph Hellwig
2014-11-29 10:08 ` Sabrina Dubroca
2014-11-29 17:38 ` Theodore Ts'o
2014-11-29 22:08 ` Jeremiah Mahler
2014-11-26 2:41 Stephen Rothwell
2010-09-21 4:04 Stephen Rothwell
2010-10-23 2:47 ` Stephen Rothwell
2010-04-29 3:51 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=20230627104646.35f4279d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=axboe@kernel$(echo .)dk \
--cc=chengzhihao1@huawei$(echo .)com \
--cc=hch@lst$(echo .)de \
--cc=jack@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tytso@mit$(echo .)edu \
/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