[PATCH 2/2] block: Drop NULL check in bdev_write_zeroes_sectors()
From: John Garry <john.g.garry@oracle.com>
Date: 2024-08-15 08:28:42
Subsystem:
block layer, the rest · Maintainers:
Jens Axboe, Linus Torvalds
Function bdev_get_queue() must not return NULL, so drop the check in bdev_write_zeroes_sectors(). Signed-off-by: John Garry <john.g.garry@oracle.com> --- include/linux/blkdev.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index e85ec73a07d5..b7664d593486 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h@@ -1296,12 +1296,7 @@ bdev_max_secure_erase_sectors(struct block_device *bdev) static inline unsigned int bdev_write_zeroes_sectors(struct block_device *bdev) { - struct request_queue *q = bdev_get_queue(bdev); - - if (q) - return q->limits.max_write_zeroes_sectors; - - return 0; + return bdev_get_queue(bdev)->limits.max_write_zeroes_sectors; } static inline bool bdev_nonrot(struct block_device *bdev)
--
2.31.1