Commit fa1af65b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

btrfs use bio_list_merge_init 



Use bio_list_merge_init instead of open coding bio_list_merge and
bio_list_init.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarDavid Sterba <dsterba@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20240328084147.2954434-5-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 50bc2150

fs/btrfs/raid56.c

+1 −2
Original line number Diff line number Diff line
@@ -331,12 +331,11 @@ static void steal_rbio(struct btrfs_raid_bio *src, struct btrfs_raid_bio *dest) 
static void merge_rbio(struct btrfs_raid_bio *dest,

		       struct btrfs_raid_bio *victim)

{

	bio_list_merge(&dest->bio_list, &victim->bio_list);

	bio_list_merge_init(&dest->bio_list, &victim->bio_list);

	dest->bio_list_bytes += victim->bio_list_bytes;

	/* Also inherit the bitmaps from @victim. */

	bitmap_or(&dest->dbitmap, &victim->dbitmap, &dest->dbitmap,

		  dest->stripe_nsectors);

	bio_list_init(&victim->bio_list);

}



/*