Hi all,
On Mon, 26 Feb 2024 11:12:57 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the vfs-brauner tree got a conflict in:
>
> fs/bcachefs/super-io.c
>
> between commit:
>
> 2881c58d14b6 ("bcachefs: bch2_print_opts()")
>
> from the bcachefs tree and commit:
>
> 9f2f767f5ef8 ("bcachefs: port block device access to file")
>
> from the vfs-brauner 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/bcachefs/super-io.c
> index 38a5073202c5,bd64eb68e84a..000000000000
> --- a/fs/bcachefs/super-io.c
> +++ b/fs/bcachefs/super-io.c
> @@@ -715,12 -715,11 +715,12 @@@ retry
> opt_set(*opts, nochanges, true);
> }
>
> - if (IS_ERR(sb->bdev_handle)) {
> - ret = PTR_ERR(sb->bdev_handle);
> + if (IS_ERR(sb->s_bdev_file)) {
> + ret = PTR_ERR(sb->s_bdev_file);
> + prt_printf(&err, "error opening %s: %s", path, bch2_err_str(ret));
> goto err;
> }
> - sb->bdev = sb->bdev_handle->bdev;
> + sb->bdev = file_bdev(sb->s_bdev_file);
>
> ret = bch2_sb_realloc(sb, 0);
> if (ret) {
This is now a conflict between the bcachefs tree and Linus' tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgpFsjL2CPnBT.pgp
Description: OpenPGP digital signature
