diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-09 13:25:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-09 13:25:14 -0700 |
| commit | 506c30790f5409ce58aa21c14d7c2aa86df328f5 (patch) | |
| tree | 70d0ba9862f749e2789828e95d6b8301ea56dd28 /block/blk-settings.c | |
| parent | 0a55a1fbed0b65ed52491caada7d2e936573d464 (diff) | |
| parent | 35c820e71565d1fa835b82499359218b219828ac (diff) | |
| download | linux-rpi-506c30790f5409ce58aa21c14d7c2aa86df328f5.tar.gz linux-rpi-506c30790f5409ce58aa21c14d7c2aa86df328f5.tar.bz2 linux-rpi-506c30790f5409ce58aa21c14d7c2aa86df328f5.zip | |
Merge tag 'block-5.13-2021-05-09' of git://git.kernel.dk/linux-block
Pull block fix from Jens Axboe:
"Turns out the bio max size change still has issues, so let's get it
reverted for 5.13-rc1. We'll shake out the issues there and defer it
to 5.14 instead"
* tag 'block-5.13-2021-05-09' of git://git.kernel.dk/linux-block:
Revert "bio: limit bio max size"
Diffstat (limited to 'block/blk-settings.c')
| -rw-r--r-- | block/blk-settings.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/block/blk-settings.c b/block/blk-settings.c index c6f80e3b8020..902c40d67120 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -32,7 +32,6 @@ EXPORT_SYMBOL_GPL(blk_queue_rq_timeout); */ void blk_set_default_limits(struct queue_limits *lim) { - lim->bio_max_bytes = UINT_MAX; lim->max_segments = BLK_MAX_SEGMENTS; lim->max_discard_segments = 1; lim->max_integrity_segments = 0; @@ -141,10 +140,6 @@ void blk_queue_max_hw_sectors(struct request_queue *q, unsigned int max_hw_secto limits->logical_block_size >> SECTOR_SHIFT); limits->max_sectors = max_sectors; - if (check_shl_overflow(max_sectors, SECTOR_SHIFT, - &limits->bio_max_bytes)) - limits->bio_max_bytes = UINT_MAX; - q->backing_dev_info->io_pages = max_sectors >> (PAGE_SHIFT - 9); } EXPORT_SYMBOL(blk_queue_max_hw_sectors); |