block: simplify queue_logical_block_size

Christoph Hellwig · axboe · commit 5476394aa9f2 · 2024-06-28T15:06:16.000-06:00
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 <hch@lst.de> Reviewed-by: John Garry <john.g.garry@oracle.com> Link: https://lore.kernel.org/r/20240627111407.476276-2-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -1227,12 +1227,7 @@ static inline unsigned int bdev_max_segments(struct block_device *bdev)`
`1227`	`1227`
`1228`	`1228`	`static inline unsigned queue_logical_block_size(const struct request_queue *q)`
`1229`	`1229`	`{`
`1230`		`- int retval = 512;`
`1231`		`-`
`1232`		`- if (q && q->limits.logical_block_size)`
`1233`		`- retval = q->limits.logical_block_size;`
`1234`		`-`
`1235`		`- return retval;`
	`1230`	`+ return q->limits.logical_block_size;`
`1236`	`1231`	`}`
`1237`	`1232`
`1238`	`1233`	`static inline unsigned int bdev_logical_block_size(struct block_device *bdev)`