From: Christoph Hellwig <hch@lst.de>
Date: Thu, 20 Aug 2020 07:56:58 +0000 (+0200)
Subject: block: optimize blk_queue_zoned_model for !CONFIG_BLK_DEV_ZONED
X-Git-Tag: v5.10-rc1~165^2~1^2~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6fcd669514794da08ce6bfa272b6ec9b33cb543d;p=thirdparty%2Fkernel%2Flinux.git

block: optimize blk_queue_zoned_model for !CONFIG_BLK_DEV_ZONED

Always return BLK_ZONED_NONE if zoned device support is not enabled.
This allows various compiler optimizations including the dead code
elimination that we so like for avoiding ifdefs.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
---

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 8e77f12de5221..1b81b2766858b 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -692,7 +692,9 @@ static inline bool queue_is_mq(struct request_queue *q)
 static inline enum blk_zoned_model
 blk_queue_zoned_model(struct request_queue *q)
 {
-	return q->limits.zoned;
+	if (IS_ENABLED(CONFIG_BLK_DEV_ZONED))
+		return q->limits.zoned;
+	return BLK_ZONED_NONE;
 }
 
 static inline bool blk_queue_is_zoned(struct request_queue *q)