diff options
| author | Jens Axboe <axboe@kernel.dk> | 2018-05-08 15:09:41 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-05-08 15:10:44 -0600 |
| commit | af097f5d199e2aa3ab3ef777f0716e487b8f7b08 (patch) | |
| tree | c93cd4dcadcadf206d7889a3d071450900137b0f /block/blk-lib.c | |
| parent | d3349b6b3c373ac1fbfb040b810fcee5e2adc7e0 (diff) | |
| download | linux-stable-af097f5d199e2aa3ab3ef777f0716e487b8f7b08.tar.gz linux-stable-af097f5d199e2aa3ab3ef777f0716e487b8f7b08.tar.bz2 linux-stable-af097f5d199e2aa3ab3ef777f0716e487b8f7b08.zip | |
block: break discard submissions into the user defined size
Don't build discards bigger than what the user asked for, if the
user decided to limit the size by writing to 'discard_max_bytes'.
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-lib.c')
| -rw-r--r-- | block/blk-lib.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/block/blk-lib.c b/block/blk-lib.c index a676084d4740..8faa70f26fcd 100644 --- a/block/blk-lib.c +++ b/block/blk-lib.c @@ -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. */ |