2022-05-04 07:53:59

by Stephen Rothwell

[permalink] [raw]

Subject: linux-next: build failure after merge of the block tree

---

Hi all,

After merging the block tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/block/xen-blkback/xenbus.c: In function 'xen_blkbk_discard':
drivers/block/xen-blkback/xenbus.c:578:31: error: unused variable 'q' [-Werror=unused-variable]
578 | struct request_queue *q = bdev_get_queue(bdev);
| ^
cc1: all warnings being treated as errors

Caused by commit

c899b2353386 ("xen-blkback: use bdev_discard_alignment")

I have applied the following fix patch for today.

From: Stephen Rothwell <[email protected]>
Date: Wed, 4 May 2022 11:26:59 +1000
Subject: [PATCH] xen-blkback: remove unused variable

Fixes: c899b2353386 ("xen-blkback: use bdev_discard_alignment")
Signed-off-by: Stephen Rothwell <[email protected]>
---
drivers/block/xen-blkback/xenbus.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
index 04c90cb8955f..97de13b14175 100644
--- a/drivers/block/xen-blkback/xenbus.c
+++ b/drivers/block/xen-blkback/xenbus.c
@@ -575,7 +575,6 @@ static void xen_blkbk_discard(struct xenbus_transaction xbt, struct backend_info
int err;
int state = 0;
struct block_device *bdev = be->blkif->vbd.bdev;
- struct request_queue *q = bdev_get_queue(bdev);

if (!xenbus_read_unsigned(dev->nodename, "discard-enable", 1))
return;
--
2.35.1

--
Cheers,
Stephen Rothwell

---

Attachments:

(No filename) (495.00 B)
OpenPGP digital signature

2022-05-04 19:54:57

by Jens Axboe

[permalink] [raw]

Subject: Re: linux-next: build failure after merge of the block tree

---

On 5/3/22 7:40 PM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the block tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/block/xen-blkback/xenbus.c: In function 'xen_blkbk_discard':
> drivers/block/xen-blkback/xenbus.c:578:31: error: unused variable 'q' [-Werror=unused-variable]
> 578 | struct request_queue *q = bdev_get_queue(bdev);
> | ^
> cc1: all warnings being treated as errors
>
> Caused by commit
>
> c899b2353386 ("xen-blkback: use bdev_discard_alignment")

Thanks, folded in the fix.

--
Jens Axboe