Merge branch 'for-5.18/block' into for-5.18/write-streams
* for-5.18/block: (96 commits) block: remove bio_devname ext4: stop using bio_devname raid5-ppl: stop using bio_devname raid1: stop using bio_devname md-multipath: stop using bio_devname dm-integrity: stop using bio_devname dm-crypt: stop using bio_devname pktcdvd: remove a pointless debug check in pkt_submit_bio block: remove handle_bad_sector block: fix and cleanup bio_check_ro bfq: fix use-after-free in bfq_dispatch_request blk-crypto: show crypto capabilities in sysfs block: don't delete queue kobject before its children block: simplify calling convention of elv_unregister_queue() block: remove redundant semicolon block: default BLOCK_LEGACY_AUTOLOAD to y block: update io_ticks when io hang block, bfq: don't move oom_bfqq block, bfq: avoid moving bfqq to it's parent bfqg block, bfq: cleanup bfq_bfqq_to_bfqg() ...
This commit is contained in:
@@ -3143,7 +3143,7 @@ struct bio *btrfs_bio_alloc(unsigned int nr_iovecs)
|
||||
struct bio *bio;
|
||||
|
||||
ASSERT(0 < nr_iovecs && nr_iovecs <= BIO_MAX_VECS);
|
||||
bio = bio_alloc_bioset(GFP_NOFS, nr_iovecs, &btrfs_bioset);
|
||||
bio = bio_alloc_bioset(NULL, nr_iovecs, 0, GFP_NOFS, &btrfs_bioset);
|
||||
btrfs_bio_init(btrfs_bio(bio));
|
||||
return bio;
|
||||
}
|
||||
@@ -3154,7 +3154,7 @@ struct bio *btrfs_bio_clone(struct bio *bio)
|
||||
struct bio *new;
|
||||
|
||||
/* Bio allocation backed by a bioset does not fail */
|
||||
new = bio_clone_fast(bio, GFP_NOFS, &btrfs_bioset);
|
||||
new = bio_alloc_clone(bio->bi_bdev, bio, GFP_NOFS, &btrfs_bioset);
|
||||
bbio = btrfs_bio(new);
|
||||
btrfs_bio_init(bbio);
|
||||
bbio->iter = bio->bi_iter;
|
||||
@@ -3169,7 +3169,7 @@ struct bio *btrfs_bio_clone_partial(struct bio *orig, u64 offset, u64 size)
|
||||
ASSERT(offset <= UINT_MAX && size <= UINT_MAX);
|
||||
|
||||
/* this will never fail when it's backed by a bioset */
|
||||
bio = bio_clone_fast(orig, GFP_NOFS, &btrfs_bioset);
|
||||
bio = bio_alloc_clone(orig->bi_bdev, orig, GFP_NOFS, &btrfs_bioset);
|
||||
ASSERT(bio);
|
||||
|
||||
bbio = btrfs_bio(bio);
|
||||
|
||||
Reference in New Issue
Block a user