From: Jan Kara <jack@suse.cz>
To: Kent Overstreet <kent.overstreet@linux.dev>
Cc: Jan Kara <jack@suse.cz>, Stephen Rothwell <sfr@canb.auug.org.au>,
Christian Brauner <brauner@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the vfs-brauner tree
Date: Wed, 4 Oct 2023 17:46:28 +0200 [thread overview]
Message-ID: <20231004154628.kgrvqbwphkjbkne6@quack3> (raw)
In-Reply-To: <20231003132711.djftyh7vltljy2hh@moria.home.lan>
On Tue 03-10-23 09:27:11, Kent Overstreet wrote:
> On Mon, Oct 02, 2023 at 01:21:42PM +0200, Jan Kara wrote:
> > Hi!
> >
> > On Thu 28-09-23 10:54:43, Stephen Rothwell wrote:
> > > After merging the vfs-brauner tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > fs/bcachefs/super-io.c: In function 'bch2_free_super':
> > > fs/bcachefs/super-io.c:166:17: error: implicit declaration of function 'blkdev_put'; did you mean 'bdi_put'? [-Werror=implicit-function-declaration]
> > > 166 | blkdev_put(sb->bdev, sb->holder);
> > > | ^~~~~~~~~~
> > > | bdi_put
> > > fs/bcachefs/super-io.c: In function 'bch2_read_super':
> > > fs/bcachefs/super-io.c:687:20: error: implicit declaration of function 'blkdev_get_by_path'; did you mean 'bdev_open_by_path'? [-Werror=implicit-function-declaration]
> > > 687 | sb->bdev = blkdev_get_by_path(path, sb->mode, sb->holder, &bch2_sb_handle_bdev_ops);
> > > | ^~~~~~~~~~~~~~~~~~
> > > | bdev_open_by_path
> > > fs/bcachefs/super-io.c:687:18: error: assignment to 'struct block_device *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
> > > 687 | sb->bdev = blkdev_get_by_path(path, sb->mode, sb->holder, &bch2_sb_handle_bdev_ops);
> > > | ^
> > > fs/bcachefs/super-io.c:693:26: error: assignment to 'struct block_device *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
> > > 693 | sb->bdev = blkdev_get_by_path(path, sb->mode, sb->holder, &bch2_sb_handle_bdev_ops);
> > > | ^
> > > cc1: all warnings being treated as errors
> > >
> > > Caused by commit
> > >
> > > 953863a5a2ff ("block: Remove blkdev_get_by_*() functions")
> > >
> > > interacting with commit(s) from the bcachefs tree.
> > >
> > > I would have reverted that commit for today, except I used the old
> > > vfs-brauner tree due to another build failure. Can we just delay this
> > > one commit until after bcachefs has been converted (and any other
> > > references that may be added are fixed)?
> >
> > Yeah, I guess removing the final commit is the easiest solution at this
> > point. It complicates a bit the series to disallow writing to mounted block
> > devices which bases on this - either I have to pospone that to the next
> > cycle after we convert bcachefs or I have to find a way for the old
> > blkdev_get_by_path() API and the new functionality to coexist. I'll think
> > about that.
>
> Jan, Christain - what do you need from me for the conversion?
Well, the conversion is rather easy. You just need to call the new
bdev_open_by_path() function instead of the old blkdev_get_by_path(). It
returns struct bdev_handle (instead of plain struct bdev) and you
eventually need to pass this struct to bdev_release() (instead of calling
blkdev_put()).
But the merge at this point would be somewhat difficult because you'd need
to pull Christian's branch into your tree to get bdev_open_by_path() in the
first place. And that branch already depends on some changes in the btrfs
tree. So to save ourselves some headaches during the merge window, I think
not removing the old functions until bcachefs gets merged is the easiest
solution.
Honza
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
next prev parent reply other threads:[~2023-10-04 15:46 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-28 0:54 linux-next: build failure after merge of the vfs-brauner tree 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 [this message]
2023-10-09 14:00 ` Christian Brauner
-- strict thread matches above, loose matches on Subject: below --
2024-04-04 2:24 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-31 1:07 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: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=20231004154628.kgrvqbwphkjbkne6@quack3 \
--to=jack@suse.cz \
--cc=brauner@kernel.org \
--cc=kent.overstreet@linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).