|
@@ -62,10 +62,16 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,
|
|
|
unsigned int req_sects;
|
|
|
sector_t end_sect, tmp;
|
|
|
|
|
|
- /* Make sure bi_size doesn't overflow */
|
|
|
- req_sects = min_t(sector_t, nr_sects, UINT_MAX >> 9);
|
|
|
+ /*
|
|
|
+ * Issue in chunks of the user defined max discard setting,
|
|
|
+ * ensuring that bi_size doesn't overflow
|
|
|
+ */
|
|
|
+ req_sects = min_t(sector_t, nr_sects,
|
|
|
+ q->limits.max_discard_sectors);
|
|
|
+ if (req_sects > UINT_MAX >> 9)
|
|
|
+ req_sects = UINT_MAX >> 9;
|
|
|
|
|
|
- /**
|
|
|
+ /*
|
|
|
* If splitting a request, and the next starting sector would be
|
|
|
* misaligned, stop the discard at the previous aligned sector.
|
|
|
*/
|