Commit 640f2a23 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

block: use bdev_alignment_offset in disk_alignment_offset_show

This does the same as the open coded variant except for an extra branch,
and allows to remove queue_alignment_offset entirely.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20220415045258.199825-18-hch@lst.deSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 64dcc7c2
...@@ -1010,7 +1010,7 @@ static ssize_t disk_alignment_offset_show(struct device *dev, ...@@ -1010,7 +1010,7 @@ static ssize_t disk_alignment_offset_show(struct device *dev,
{ {
struct gendisk *disk = dev_to_disk(dev); struct gendisk *disk = dev_to_disk(dev);
return sprintf(buf, "%d\n", queue_alignment_offset(disk->queue)); return sprintf(buf, "%d\n", bdev_alignment_offset(disk->part0));
} }
static ssize_t disk_discard_alignment_show(struct device *dev, static ssize_t disk_discard_alignment_show(struct device *dev,
......
...@@ -1251,14 +1251,6 @@ bdev_zone_write_granularity(struct block_device *bdev) ...@@ -1251,14 +1251,6 @@ bdev_zone_write_granularity(struct block_device *bdev)
return queue_zone_write_granularity(bdev_get_queue(bdev)); return queue_zone_write_granularity(bdev_get_queue(bdev));
} }
static inline int queue_alignment_offset(const struct request_queue *q)
{
if (q->limits.misaligned)
return -1;
return q->limits.alignment_offset;
}
static inline int queue_limit_alignment_offset(struct queue_limits *lim, sector_t sector) static inline int queue_limit_alignment_offset(struct queue_limits *lim, sector_t sector)
{ {
unsigned int granularity = max(lim->physical_block_size, lim->io_min); unsigned int granularity = max(lim->physical_block_size, lim->io_min);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment