| Message ID | 20201229152713.7269-1-tom.ty89@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | block: avoid fragmented discard splits | expand |
diff --git a/block/blk.h b/block/blk.h index 7550364c326c..e87324a227c6 100644 --- a/block/blk.h +++ b/block/blk.h @@ -268,8 +268,12 @@ static inline unsigned int bio_allowed_max_sectors(struct request_queue *q) static inline unsigned int bio_aligned_discard_max_sectors( struct request_queue *q) { - return round_down(UINT_MAX, q->limits.discard_granularity) >> - SECTOR_SHIFT; + unsigned int badms = round_down(UINT_MAX, + q->limits.discard_granularity) >> + SECTOR_SHIFT; + if (badms > q->limits.max_discard_sectors) + badms = round_down(badms, q->limits.max_discard_sectors); + return badms; } /*
Make bio_aligned_discard max_sectors() return value that is divisible by the max_discard_sectors queue limit to avoid fragmented discard splits. Signed-off-by: Tom Yan <tom.ty89@gmail.com> --- block/blk.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)