aboutsummaryrefslogtreecommitdiff
path: root/include/linux/blkdev.h
diff options
context:
space:
mode:
authorGravatar Christoph Hellwig <hch@lst.de> 2022-04-15 06:52:50 +0200
committerGravatar Jens Axboe <axboe@kernel.dk> 2022-04-17 19:49:59 -0600
commit4e1462ffe8998749884d61f91be251a7a8719677 (patch)
treed414406b2e59976346b235a6db45fcb14c6be1e4 /include/linux/blkdev.h
parentblock: move bdev_alignment_offset and queue_limit_alignment_offset out of line (diff)
downloadlinux-4e1462ffe8998749884d61f91be251a7a8719677.tar.gz
linux-4e1462ffe8998749884d61f91be251a7a8719677.tar.bz2
linux-4e1462ffe8998749884d61f91be251a7a8719677.zip
block: remove queue_discard_alignment
Just use bdev_alignment_offset in disk_discard_alignment_show instead. That helpers is the same except for an always false branch that doesn't matter in this slow path. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Link: https://lore.kernel.org/r/20220415045258.199825-20-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'include/linux/blkdev.h')
-rw-r--r--include/linux/blkdev.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 0a1795ac2627..5a9b7aeda010 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1253,14 +1253,6 @@ bdev_zone_write_granularity(struct block_device *bdev)
int bdev_alignment_offset(struct block_device *bdev);
-static inline int queue_discard_alignment(const struct request_queue *q)
-{
- if (q->limits.discard_misaligned)
- return -1;
-
- return q->limits.discard_alignment;
-}
-
static inline int queue_limit_discard_alignment(struct queue_limits *lim, sector_t sector)
{
unsigned int alignment, granularity, offset;