From: Christoph Hellwig Date: Thu, 27 Jun 2024 11:14:01 +0000 (+0200) Subject: block: simplify queue_logical_block_size X-Git-Tag: v6.11-rc1~80^2~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5476394aa9f27d670dd2bac426fdb6ac12b12cb3;p=thirdparty%2Fkernel%2Flinux.git block: simplify queue_logical_block_size queue_logical_block_size is never called with a 0 queue, and the logical_block_size field in queue_limits is always initialized for a live queue. Signed-off-by: Christoph Hellwig Reviewed-by: John Garry Link: https://lore.kernel.org/r/20240627111407.476276-2-hch@lst.de Signed-off-by: Jens Axboe --- diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 53c41ef4222c3..4d0d4b83bc740 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1227,12 +1227,7 @@ static inline unsigned int bdev_max_segments(struct block_device *bdev) static inline unsigned queue_logical_block_size(const struct request_queue *q) { - int retval = 512; - - if (q && q->limits.logical_block_size) - retval = q->limits.logical_block_size; - - return retval; + return q->limits.logical_block_size; } static inline unsigned int bdev_logical_block_size(struct block_device *bdev)