Skip to contentSkip to conversation

block: avoid fragmented discard splits

PATCH New Tom Yan 1 participant 1 message Dec 29, 2020 Block layer

lore
Share & tools
lore

Tom Yan

author
#0 lore raw

PATCH 1/1 block: avoid fragmented discard splits

Make bio_aligned_discard max_sectors() return value that is divisible by the max_discard_sectors queue limit to avoid fragmented discard splits.

---
 block/blk.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
block/blk.h +6 -2
index 7550364c326c..e87324a227c6 100644
@@ -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;
 }
 
 /*
Signature · 1 line
2.29.2