Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
Date:   Tue, 31 Oct 2023 12:07:45 +1100
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
Message-ID: <20231031120745.5d01f1a2@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/cnVZEnIZ.I8xrsAS=OVssgV";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/cnVZEnIZ.I8xrsAS=OVssgV
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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 'fre=
eze_bdev' [-Werror=3Dimplicit-function-declaration]
  294 |                 ret =3D freeze_bdev(c->vfs_sb->s_bdev);
      |                       ^~~~~~~~~~~
fs/bcachefs/fs-ioctl.c:301:17: error: implicit declaration of function 'tha=
w_bdev' [-Werror=3Dimplicit-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)
=20
 	switch (flags) {
 	case FSOP_GOING_FLAGS_DEFAULT:
-		ret =3D freeze_bdev(c->vfs_sb->s_bdev);
+		ret =3D bdev_freeze(c->vfs_sb->s_bdev);
 		if (ret)
 			goto err;
=20
 		bch2_journal_flush(&c->journal);
 		c->vfs_sb->s_flags |=3D SB_RDONLY;
 		bch2_fs_emergency_read_only(c);
-		thaw_bdev(c->vfs_sb->s_bdev);
+		bdev_thaw(c->vfs_sb->s_bdev);
 		break;
=20
 	case FSOP_GOING_FLAGS_LOGFLUSH:
--=20
2.40.1

--=20
Cheers,
Stephen Rothwell

--Sig_/cnVZEnIZ.I8xrsAS=OVssgV
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVAU2EACgkQAVBC80lX
0GyFuggAlQUOE8QohYRRq0DVz1HI9UrQotp8vBqTy7NNaOPe37LynoNxxuH3+/IW
rrru11Fop2f3yG5fcLU+M8h+gmYtslQ9Y1Va3If3C11eyva8kcK2RMmBytIOcuzw
ibRW8JwtguL3izgf+IMHqi6bDLKSrbAgKozh4oXbrwdmx7vKMxWiYDTdpqf1+Idk
4D0dl/Iyf2/DC/AMOIXQ2WL77lMEWMxSgizXXA2oQqs+FM8le57WUQyjQBFC0Lcv
jarkGHNey7FrThRbZMO/dUx+ZuGCmMacRuUFrXzilq71vNFvcFunMXpt/4jMFI33
CVGGbTnxyGcOqb/0Wai0dtZDZBoB3A==
=lICs
-----END PGP SIGNATURE-----

--Sig_/cnVZEnIZ.I8xrsAS=OVssgV--