From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>, Theodore Ts'o <tytso@mit.edu>
Cc: Christoph Hellwig <hch@lst.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Zhihao Cheng <chengzhihao1@huawei.com>
Subject: linux-next: manual merge of the block tree with the ext4 tree
Date: Tue, 13 Jun 2023 12:54:08 +1000 [thread overview]
Message-ID: <20230613125408.7321db60@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1372 bytes --]
Hi all,
Today's linux-next merge of the block tree got a conflict in:
fs/ext4/super.c
between commit:
63bc068f0d1a ("ext4: Fix reusing stale buffer heads from last failed mounting")
from the ext4 tree and commit:
2736e8eeb0cc ("block: use the holder as indication for exclusive opens")
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,94a7b56ed876..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_es);
sbi->s_journal_bdev = NULL;
}
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-06-13 2:54 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-13 2:54 Stephen Rothwell [this message]
2023-06-13 5:00 ` linux-next: manual merge of the block tree with the ext4 tree Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2023-06-26 3:09 Stephen Rothwell
2023-06-26 8:00 ` Christoph Hellwig
2023-06-27 0:46 ` Stephen Rothwell
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=20230613125408.7321db60@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=axboe@kernel.dk \
--cc=chengzhihao1@huawei.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).