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

[Stephen Rothwell]

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 <sfr@xxxxxxxxxxxxxxxx>
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 <sfr@xxxxxxxxxxxxxxxx>
---
 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

Attachment: pgpgPblOb2E4a.pgp
Description: OpenPGP digital signature