[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date: Tue, 2 Feb 2021 13:57:14 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jens Axboe <axboe@...nel.dk>, David Sterba <dsterba@...e.cz>
Cc: Christoph Hellwig <hch@....de>, David Sterba <dsterba@...e.com>,
Johannes Thumshirn <johannes.thumshirn@....com>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Hi all,
After merging the block tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
block/bio.c: In function 'bio_add_zone_append_page':
block/bio.c:860:31: error: 'struct bio' has no member named 'bi_disk'
860 | struct request_queue *q = bio->bi_disk->queue;
| ^~
Caused by commit
309dca309fc3 ("block: store a block_device pointer in struct bio")
interacting with commit
9f678097f3de ("block: add bio_add_zone_append_page")
from the btrfs tree.
I applied the following merge fix up for today.
From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Tue, 2 Feb 2021 13:54:29 +1100
Subject: [PATCH] block: bio: fix up for bi_disk removal
Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
block/bio.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block/bio.c b/block/bio.c
index bf3ab1b5c844..e3b9d3e0a196 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -857,7 +857,7 @@ EXPORT_SYMBOL(bio_add_pc_page);
int bio_add_zone_append_page(struct bio *bio, struct page *page,
unsigned int len, unsigned int offset)
{
- struct request_queue *q = bio->bi_disk->queue;
+ struct request_queue *q = bio->bi_bdev->bd_disk->queue;
bool same_page = false;
if (WARN_ON_ONCE(bio_op(bio) != REQ_OP_ZONE_APPEND))
--
2.29.2
--
Cheers,
Stephen Rothwell
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists