From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jens Axboe <axboe@kernel•dk>, "Darrick J. Wong" <djwong@kernel•org>
Cc: Christoph Hellwig <hch@lst•de>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the block tree with the djw-vfs tree
Date: Thu, 3 Aug 2023 11:28:30 +1000 [thread overview]
Message-ID: <20230803112830.21c805a7@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1295 bytes --]
Hi all,
Today's linux-next merge of the block tree got a conflict in:
fs/super.c
between commit:
880b9577855e ("fs: distinguish between user initiated freeze and kernel initiated freeze")
from the djw-vfs tree and commit:
4a8b719f95c0 ("fs: remove emergency_thaw_bdev")
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/super.c
index edc588bca7fc,bc666e7ee1a9..000000000000
--- a/fs/super.c
+++ b/fs/super.c
@@@ -1029,8 -1029,10 +1029,10 @@@ static void do_thaw_all_callback(struc
{
down_write(&sb->s_umount);
if (sb->s_root && sb->s_flags & SB_BORN) {
- emergency_thaw_bdev(sb);
+ if (IS_ENABLED(CONFIG_BLOCK))
+ while (sb->s_bdev && !thaw_bdev(sb->s_bdev))
+ pr_warn("Emergency Thaw on %pg\n", sb->s_bdev);
- thaw_super_locked(sb);
+ thaw_super_locked(sb, FREEZE_HOLDER_USERSPACE);
} else {
up_write(&sb->s_umount);
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-08-03 1:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-03 1:28 Stephen Rothwell [this message]
2023-08-03 3:08 ` linux-next: manual merge of the block tree with the djw-vfs tree Darrick J. Wong
-- strict thread matches above, loose matches on Subject: below --
2020-05-22 4:58 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=20230803112830.21c805a7@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=axboe@kernel$(echo .)dk \
--cc=djwong@kernel$(echo .)org \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.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