From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Alasdair G Kergon <agk@redhat•com>,
Mike Snitzer <snitzer@redhat•com>, Jens Axboe <axboe@kernel•dk>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Kent Overstreet <kent.overstreet@gmail•com>
Subject: linux-next: build failure after merge of the device-mapper tree
Date: Thu, 31 May 2018 14:23:02 +1000 [thread overview]
Message-ID: <20180531142302.5f7b4302@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 3098 bytes --]
Hi all,
After merging the device-mapper tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/md/dm-writecache.c: In function 'writecache_dtr':
drivers/md/dm-writecache.c:1799:3: error: implicit declaration of function 'bioset_free'; did you mean 'bvec_free'? [-Werror=implicit-function-declaration]
bioset_free(wc->bio_set);
^~~~~~~~~~~
bvec_free
drivers/md/dm-writecache.c: In function 'writecache_ctr':
drivers/md/dm-writecache.c:1929:17: error: implicit declaration of function 'bioset_create'; did you mean 'bioset_exit'? [-Werror=implicit-function-declaration]
wc->bio_set = bioset_create(BIO_POOL_SIZE,
^~~~~~~~~~~~~
bioset_exit
drivers/md/dm-writecache.c:1929:15: warning: assignment makes pointer from integer without a cast [-Wint-conversion]
wc->bio_set = bioset_create(BIO_POOL_SIZE,
^
Caused by commit
2105231db61b ("dm: add writecache target")
interacting with commit
dad08527525f ("block: Drop bioset_create()")
from the block tree.
Can we please consider not immediately dropping APIs if at all
possible. :-(
I have added the following merge fix patch (hopefully this is enough):
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Thu, 31 May 2018 14:06:10 +1000
Subject: [PATCH] dm: fixup for "block: Drop bioset_create()"
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/md/dm-writecache.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/md/dm-writecache.c b/drivers/md/dm-writecache.c
index 844c4fb2fcfc..b95f1f0e199d 100644
--- a/drivers/md/dm-writecache.c
+++ b/drivers/md/dm-writecache.c
@@ -211,7 +211,7 @@ struct dm_writecache {
struct completion flush_completion;
struct bio *flush_bio;
- struct bio_set *bio_set;
+ struct bio_set bio_set;
mempool_t *copy_pool;
struct dm_kcopyd_client *dm_kcopyd;
@@ -1494,7 +1494,7 @@ static void __writecache_writeback_pmem(struct dm_writecache *wc, struct writeba
max_pages = e->wc_list_contiguous;
- bio = bio_alloc_bioset(GFP_NOIO, max_pages, wc->bio_set);
+ bio = bio_alloc_bioset(GFP_NOIO, max_pages, &wc->bio_set);
wb = container_of(bio, struct writeback_struct, bio);
wb->wc = wc;
wb->bio.bi_end_io = writecache_writeback_endio;
@@ -1795,8 +1795,7 @@ static void writecache_dtr(struct dm_target *ti)
if (wc->flush_thread)
kthread_stop(wc->flush_thread);
- if (wc->bio_set)
- bioset_free(wc->bio_set);
+ bioset_exit(&wc->bio_set);
mempool_destroy(wc->copy_pool);
@@ -1926,11 +1925,10 @@ static int writecache_ctr(struct dm_target *ti, unsigned argc, char **argv)
}
if (WC_MODE_PMEM(wc)) {
- wc->bio_set = bioset_create(BIO_POOL_SIZE,
+ r = bioset_init(&wc->bio_set, BIO_POOL_SIZE,
offsetof(struct writeback_struct, bio),
BIOSET_NEED_BVECS);
- if (!wc->bio_set) {
- r = -ENOMEM;
+ if (r) {
ti->error = "Could not allocate bio set";
goto bad;
}
--
2.17.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-05-31 4:23 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-31 4:23 Stephen Rothwell [this message]
2018-05-31 4:35 ` linux-next: build failure after merge of the device-mapper tree Jens Axboe
2018-05-31 4:38 ` Stephen Rothwell
2018-05-31 12:10 ` Mike Snitzer
2018-05-31 14:20 ` Jens Axboe
2018-05-31 14:22 ` Jens Axboe
2018-05-31 15:02 ` Jens Axboe
2018-05-31 21:42 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-08-15 3:05 Stephen Rothwell
2025-08-15 8:05 ` Bagas Sanjaya
2025-08-15 15:21 ` Mikulas Patocka
2025-04-10 2:20 Stephen Rothwell
2024-02-07 3:40 Stephen Rothwell
2024-02-07 3:54 ` Matthew Sakai
2024-02-07 15:47 ` Mike Snitzer
2023-09-15 0:06 Stephen Rothwell
2023-06-23 4:30 Stephen Rothwell
2023-06-23 16:47 ` Demi Marie Obenour
2021-02-11 3:36 Stephen Rothwell
2021-02-11 14:37 ` Mike Snitzer
2020-04-22 2:54 Stephen Rothwell
2018-12-06 6:21 Stephen Rothwell
2018-12-06 13:41 ` Mike Snitzer
2018-12-06 20:23 ` Stephen Rothwell
2018-03-27 2:39 Stephen Rothwell
2018-03-27 15:39 ` Bart Van Assche
2017-06-19 2:27 Stephen Rothwell
2017-06-09 3:12 Stephen Rothwell
2017-06-09 4:28 ` Damien Le Moal
2017-06-09 11:59 ` Mike Snitzer
2016-03-04 2:59 Stephen Rothwell
2016-03-04 3:14 ` Mike Snitzer
2015-11-01 10:43 Stephen Rothwell
2015-11-01 13:44 ` Mike Snitzer
2015-07-05 23:27 Stephen Rothwell
2015-05-22 3:27 Stephen Rothwell
2015-05-22 12:49 ` Mike Snitzer
2015-05-22 13:26 ` Mike Snitzer
2015-05-22 14:58 ` Jens Axboe
2014-01-15 3:52 Stephen Rothwell
2014-01-15 4:30 ` Mike Snitzer
2013-11-05 2:51 Stephen Rothwell
2013-11-05 3:20 ` Mike Snitzer
2013-11-05 3:32 ` Stephen Rothwell
2013-11-05 12:54 ` Mike Snitzer
2013-11-05 16:22 ` Jens Axboe
2013-11-05 22:42 ` Stephen Rothwell
2013-11-05 22:44 ` Jens Axboe
2010-08-02 1:31 Stephen Rothwell
2010-08-02 6:44 ` Milan Broz
2010-08-02 11:34 ` Alasdair G Kergon
2010-06-30 2:57 Stephen Rothwell
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=20180531142302.5f7b4302@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=agk@redhat$(echo .)com \
--cc=axboe@kernel$(echo .)dk \
--cc=kent.overstreet@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=snitzer@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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