aboutsummaryrefslogtreecommitdiff
path: root/include/linux/blkdev.h
diff options
context:
space:
mode:
authorGravatar Christoph Hellwig <hch@lst.de> 2022-07-06 09:03:35 +0200
committerGravatar Jens Axboe <axboe@kernel.dk> 2022-07-06 06:46:25 -0600
commitf1a8bbd1100d9cd117bc8b7fc0903982bbaf474f (patch)
tree360f36b26f54307cc1d16acaa3a911a9389c58a1 /include/linux/blkdev.h
parentblk-mq: Drop local variable for reserved tag (diff)
downloadlinux-f1a8bbd1100d9cd117bc8b7fc0903982bbaf474f.tar.gz
linux-f1a8bbd1100d9cd117bc8b7fc0903982bbaf474f.tar.bz2
linux-f1a8bbd1100d9cd117bc8b7fc0903982bbaf474f.zip
block: remove a superflous ifdef in blkdev.h
It doesn't hurt to always have the blk_zone_cond_str prototype, and the two inlines can also be defined unconditionally. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com> Reviewed-by: Damien Le Moal <damien.lemoal@opensource.wdc.com> Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com> Link: https://lore.kernel.org/r/20220706070350.1703384-2-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'include/linux/blkdev.h')
-rw-r--r--include/linux/blkdev.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index b9a94c53c6cd..270cd0c55292 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -899,8 +899,6 @@ static inline struct request_queue *bdev_get_queue(struct block_device *bdev)
return bdev->bd_queue; /* this is never NULL */
}
-#ifdef CONFIG_BLK_DEV_ZONED
-
/* Helper to convert BLK_ZONE_ZONE_XXX to its string format XXX */
const char *blk_zone_cond_str(enum blk_zone_cond zone_cond);
@@ -915,7 +913,6 @@ static inline unsigned int bio_zone_is_seq(struct bio *bio)
return blk_queue_zone_is_seq(bdev_get_queue(bio->bi_bdev),
bio->bi_iter.bi_sector);
}
-#endif /* CONFIG_BLK_DEV_ZONED */
/*
* Return how much of the chunk is left to be used for I/O at a given offset.