diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-09 22:25:14 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-09 22:25:14 +0200 |
| commit | 506c30790f5409ce58aa21c14d7c2aa86df328f5 (patch) | |
| tree | 70d0ba9862f749e2789828e95d6b8301ea56dd28 /include | |
| parent | Merge tag '5.13-rc-smb3-part3' of git://git.samba.org/sfrench/cifs-2.6 (diff) | |
| parent | Revert "bio: limit bio max size" (diff) | |
| download | linux-506c30790f5409ce58aa21c14d7c2aa86df328f5.tar.xz linux-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 'include')
| -rw-r--r-- | include/linux/bio.h | 4 | ||||
| -rw-r--r-- | include/linux/blkdev.h | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/bio.h b/include/linux/bio.h index f1a99f0a240c..a0b4cfdf62a4 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -106,8 +106,6 @@ static inline void *bio_data(struct bio *bio) return NULL; } -extern unsigned int bio_max_size(struct bio *bio); - /** * bio_full - check if the bio is full * @bio: bio to check @@ -121,7 +119,7 @@ static inline bool bio_full(struct bio *bio, unsigned len) if (bio->bi_vcnt >= bio->bi_max_vecs) return true; - if (bio->bi_iter.bi_size > bio_max_size(bio) - len) + if (bio->bi_iter.bi_size > UINT_MAX - len) return true; return false; diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 9fb255b48a57..1255823b2bc0 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -326,8 +326,6 @@ enum blk_bounce { }; struct queue_limits { - unsigned int bio_max_bytes; - enum blk_bounce bounce; unsigned long seg_boundary_mask; unsigned long virt_boundary_mask; |