Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32;
Date:   Fri, 15 Sep 2023 09:47:31 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     David Sterba <dsterba@suse.cz>,
        Andrew Morton <akpm@linux-foundation.org>
Cc:     Christoph Hellwig <hch@lst.de>, David Sterba <dsterba@suse.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Qi Zheng <zhengqi.arch@bytedance.com>
Subject: Re: linux-next: manual merge of the btrfs tree with the mm tree
Message-ID: <20230915094731.076a3e98@canb.auug.org.au>
In-Reply-To: <20230915091421.58207f2c@canb.auug.org.au>
References: <20230915091421.58207f2c@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/9uejlp7IAa7pwaCXIWPCDo_";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/9uejlp7IAa7pwaCXIWPCDo_
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

[Forgot the diff ...]

On Fri, 15 Sep 2023 09:14:21 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>=20
> Today's linux-next merge of the btrfs tree got a conflict in:
>=20
>   fs/btrfs/super.c
>=20
> between commit:
>=20
>   c0824542e4d1 ("fs: super: dynamically allocate the s_shrink")
>=20
> from the mm tree and commit:
>=20
>   2ebed4689ba2 ("btrfs: open block devices after superblock creation")
>=20
> from the btrfs tree.
>=20
> 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.

--=20
Cheers,
Stephen Rothwell

diff --cc fs/btrfs/super.c
index 3b165d9967bb,3eff75e06a57..000000000000
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@@ -1518,8 -1459,23 +1459,23 @@@ static struct dentry *btrfs_mount_root(
  		if ((flags ^ s->s_flags) & SB_RDONLY)
  			error =3D -EBUSY;
  	} else {
- 		snprintf(s->s_id, sizeof(s->s_id), "%pg", bdev);
+ 		struct btrfs_fs_devices *fs_devices =3D fs_info->fs_devices;
+=20
+ 		mutex_lock(&uuid_mutex);
+ 		error =3D btrfs_open_devices(fs_devices, sb_open_mode(flags),
+ 					   fs_type);
+ 		mutex_unlock(&uuid_mutex);
+ 		if (error)
+ 			goto error_deactivate;
+=20
+ 		if (!(flags & SB_RDONLY) && fs_devices->rw_devices =3D=3D 0) {
+ 			error =3D -EACCES;
+ 			goto error_deactivate;
+ 		}
+=20
+ 		snprintf(s->s_id, sizeof(s->s_id), "%pg",
+ 			 fs_devices->latest_dev->bdev);
 -		shrinker_debugfs_rename(&s->s_shrink, "sb-%s:%s", fs_type->name,
 +		shrinker_debugfs_rename(s->s_shrink, "sb-%s:%s", fs_type->name,
  					s->s_id);
  		btrfs_sb(s)->bdev_holder =3D fs_type;
  		error =3D btrfs_fill_super(s, fs_devices, data);

--Sig_/9uejlp7IAa7pwaCXIWPCDo_
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUDm5MACgkQAVBC80lX
0GwNlgf/c8QLvGO7aWYDfCnianzsnQO453i8/VaSFrJoo6X22GtnnKFYpJ73yhxn
N+5CNz75RUJGI3/ZLlNaFY5CPoN2RTRrnnaypb5TMzuXIthynSdpSZETNwCJN8IB
O5VdkxxnLJmiaCdh8JD1QejOSlRBAjhOlMS8albR9XIuRbF8Nu4TC/PolAkz0/VE
qf3fd9PRSbf2yAe33dbIV7szOCkbY2GJtXn2LqgnDx+dTeBgTlcIT6XOCVUY/NG/
d482Y7XLdPYvVTuICHBA4h7rgYlAdHE1iJ40P3jGCALuGd8nDRYXh4zl1iZrYAa2
6V8dv/5fL1kGW8gAv2jfhnlTRmCCUQ==
=sG5a
-----END PGP SIGNATURE-----

--Sig_/9uejlp7IAa7pwaCXIWPCDo_--