diff options
| author | Jens Axboe <axboe@kernel.dk> | 2018-05-08 15:09:41 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-29 13:39:07 +0100 |
| commit | 1e9290ca9d6fa96b69c4d6125f87dc77793179e1 (patch) | |
| tree | 599947ceea061f2621f9722938a14a29ef3a665a | |
| parent | 592f5569e18471c07208f74540f4e0f646b226f7 (diff) | |
| download | linux-stable-1e9290ca9d6fa96b69c4d6125f87dc77793179e1.tar.gz linux-stable-1e9290ca9d6fa96b69c4d6125f87dc77793179e1.tar.bz2 linux-stable-1e9290ca9d6fa96b69c4d6125f87dc77793179e1.zip | |
block: break discard submissions into the user defined size
[ Upstream commit af097f5d199e2aa3ab3ef777f0716e487b8f7b08 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -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 2bc544ce3d2e..53a45663e688 100644 --- a/block/blk-lib.c +++ b/block/blk-lib.c @@ -59,10 +59,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. */ |