UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

btrfs: decide bio cloning inside submit_stripe_bio 

Remove the orig_bio argument as it can be derived from the bioc, and
the clone argument as it can be calculated from bioc and dev_nr.

Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Christoph Hellwig 2022-08-06 10:03:28 +02:00 committed by David Sterba
parent 32747c4455
commit 28793b194e
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/btrfs/volumes.c
View File

@ -6788,13 +6788,12 @@ static void btrfs_submit_dev_bio(struct btrfs_device *dev, struct bio *bio)
submit_bio(bio);
}
static void submit_stripe_bio(struct btrfs_io_context *bioc,
struct bio *orig_bio, int dev_nr, bool clone)
static void submit_stripe_bio(struct btrfs_io_context *bioc, int dev_nr)
{
struct bio *bio;
struct bio *orig_bio = bioc->orig_bio, *bio;
/* Reuse the bio embedded into the btrfs_bio for the last mirror */
if (!clone) {
if (dev_nr == bioc->num_stripes - 1) {
bio = orig_bio;
btrfs_bio(bio)->device = bioc->stripes[dev_nr].dev;
bio->bi_end_io = btrfs_end_bio;
@ -6850,11 +6849,8 @@ void btrfs_submit_bio(struct btrfs_fs_info *fs_info, struct bio *bio, int mirror
BUG();
}
for (dev_nr = 0; dev_nr < total_devs; dev_nr++) {
const bool should_clone = (dev_nr < total_devs - 1);
submit_stripe_bio(bioc, bio, dev_nr, should_clone);
}
for (dev_nr = 0; dev_nr < total_devs; dev_nr++)
submit_stripe_bio(bioc, dev_nr);
}
static bool dev_args_match_fs_devices(const struct btrfs_dev_lookup_args *args,