From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christian Brauner <brauner@kernel.org>,
Kent Overstreet <kent.overstreet@linux.dev>
Cc: Kent Overstreet <kent.overstreet@gmail.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the vfs-brauner tree
Date: Tue, 31 Oct 2023 12:07:45 +1100 [thread overview]
Message-ID: <20231031120745.5d01f1a2@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1921 bytes --]
Hi all,
After merging the vfs-brauner tree, today's linux-next build (x86_64
allmodconfig) failed like this:
fs/bcachefs/fs-ioctl.c: In function 'bch2_ioc_goingdown':
fs/bcachefs/fs-ioctl.c:294:23: error: implicit declaration of function 'freeze_bdev' [-Werror=implicit-function-declaration]
294 | ret = freeze_bdev(c->vfs_sb->s_bdev);
| ^~~~~~~~~~~
fs/bcachefs/fs-ioctl.c:301:17: error: implicit declaration of function 'thaw_bdev' [-Werror=implicit-function-declaration]
301 | thaw_bdev(c->vfs_sb->s_bdev);
| ^~~~~~~~~
Caused by commit
46bb2e011760 ("bdev: rename freeze and thaw helpers")
interacting with commit
4495cbed568b ("bcachefs: Improve FS_IOC_GOINGDOWN ioctl")
I have applied the following merge resolution patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 31 Oct 2023 12:00:27 +1100
Subject: [PATCH] fixup for "bdev: rename freeze and thaw helpers"
interacting with "bcachefs: Improve FS_IOC_GOINGDOWN ioctl".
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/bcachefs/fs-ioctl.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/bcachefs/fs-ioctl.c b/fs/bcachefs/fs-ioctl.c
index 6040bd3f0778..d715a2b35189 100644
--- a/fs/bcachefs/fs-ioctl.c
+++ b/fs/bcachefs/fs-ioctl.c
@@ -291,14 +291,14 @@ static int bch2_ioc_goingdown(struct bch_fs *c, u32 __user *arg)
switch (flags) {
case FSOP_GOING_FLAGS_DEFAULT:
- ret = freeze_bdev(c->vfs_sb->s_bdev);
+ ret = bdev_freeze(c->vfs_sb->s_bdev);
if (ret)
goto err;
bch2_journal_flush(&c->journal);
c->vfs_sb->s_flags |= SB_RDONLY;
bch2_fs_emergency_read_only(c);
- thaw_bdev(c->vfs_sb->s_bdev);
+ bdev_thaw(c->vfs_sb->s_bdev);
break;
case FSOP_GOING_FLAGS_LOGFLUSH:
--
2.40.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-10-31 1:07 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-31 1:07 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-04-04 2:24 linux-next: build failure after merge of the vfs-brauner tree Stephen Rothwell
2024-04-04 7:50 ` David Howells
2024-02-18 23:44 Stephen Rothwell
2024-03-12 23:41 ` Stephen Rothwell
2024-03-12 23:45 ` Chuck Lever III
2024-03-13 3:10 ` Stephen Rothwell
2024-02-11 23:52 Stephen Rothwell
2024-02-12 0:36 ` Kent Overstreet
2024-01-23 1:52 Stephen Rothwell
2024-01-24 1:20 ` Stephen Rothwell
2024-01-24 11:13 ` Christian Brauner
2024-01-24 11:35 ` Stephen Rothwell
2024-01-25 16:21 ` Christian Brauner
2023-12-21 0:18 Stephen Rothwell
2023-12-21 1:32 ` Matthew Wilcox
2023-12-21 23:41 ` Stephen Rothwell
2023-10-18 23:54 Stephen Rothwell
2023-10-19 9:17 ` Christian Brauner
2023-10-02 22:30 Stephen Rothwell
2023-10-03 13:24 ` Christian Brauner
2023-09-28 0:54 Stephen Rothwell
2023-10-02 11:21 ` Jan Kara
2023-10-02 11:26 ` Jan Kara
2023-10-02 21:24 ` Stephen Rothwell
2023-10-03 13:27 ` Kent Overstreet
2023-10-04 15:46 ` Jan Kara
2023-10-09 14:00 ` Christian Brauner
2023-09-28 0:39 Stephen Rothwell
2023-09-28 14:52 ` Christian Brauner
2023-08-03 0:03 Stephen Rothwell
2023-08-03 10:06 ` Jan Kara
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=20231031120745.5d01f1a2@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=brauner@kernel.org \
--cc=kent.overstreet@gmail.com \
--cc=kent.overstreet@linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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 NNTP newsgroup(s).