diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-07-03 19:27:42 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:08:23 -0400 |
| commit | 885678f68dd1bf9638087ae8b22051b464f5ec05 (patch) | |
| tree | 50f741fa071215136b5bb395b5ffe3b4249f12e4 /fs/bcachefs/fs-io.c | |
| parent | 738540f7fcdd619fe3adb8a27116f0f4371bf711 (diff) | |
| download | lwn-885678f68dd1bf9638087ae8b22051b464f5ec05.tar.gz lwn-885678f68dd1bf9638087ae8b22051b464f5ec05.zip | |
bcachefs: Kill direct access to bi_io_vec
Switch to always using bio_add_page(), which merges contiguous pages now
that we have multipage bvecs.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/fs-io.c')
| -rw-r--r-- | fs/bcachefs/fs-io.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/bcachefs/fs-io.c b/fs/bcachefs/fs-io.c index 9d0cca0bdfa3..54b071b9ca2c 100644 --- a/fs/bcachefs/fs-io.c +++ b/fs/bcachefs/fs-io.c @@ -775,7 +775,7 @@ static int bio_add_page_contig(struct bio *bio, struct page *page) else if (!bio_can_add_page_contig(bio, page)) return -1; - __bio_add_page(bio, page, PAGE_SIZE, 0); + BUG_ON(!bio_add_page(bio, page, PAGE_SIZE, 0)); return 0; } @@ -913,7 +913,7 @@ static void readpage_bio_extend(struct readpages_iter *iter, put_page(page); } - __bio_add_page(bio, page, PAGE_SIZE, 0); + BUG_ON(!bio_add_page(bio, page, PAGE_SIZE, 0)); } } @@ -1025,7 +1025,7 @@ void bch2_readahead(struct readahead_control *ractl) rbio->bio.bi_iter.bi_sector = (sector_t) index << PAGE_SECTOR_SHIFT; rbio->bio.bi_end_io = bch2_readpages_end_io; - __bio_add_page(&rbio->bio, page, PAGE_SIZE, 0); + BUG_ON(!bio_add_page(&rbio->bio, page, PAGE_SIZE, 0)); bchfs_read(&trans, iter, rbio, inode->v.i_ino, &readpages_iter); |