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

dm: 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>
Reviewed-by: default avatarMike Snitzer <snitzer@kernel.org>
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-4-hch@lst.de


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

drivers/md/dm-bio-prison-v2.c

+1 −2
Original line number Diff line number Diff line
@@ -321,8 +321,7 @@ static bool __unlock(struct dm_bio_prison_v2 *prison, 
{

	BUG_ON(!cell->exclusive_lock);



	bio_list_merge(bios, &cell->bios);

	bio_list_init(&cell->bios);

	bio_list_merge_init(bios, &cell->bios);



	if (cell->shared_count) {

		cell->exclusive_lock = false;

drivers/md/dm-cache-target.c

+4 −8
Original line number Diff line number Diff line
@@ -115,8 +115,7 @@ static void __commit(struct work_struct *_ws) 
	 */

	spin_lock_irq(&b->lock);

	list_splice_init(&b->work_items, &work_items);

	bio_list_merge(&bios, &b->bios);

	bio_list_init(&b->bios);

	bio_list_merge_init(&bios, &b->bios);

	b->commit_scheduled = false;

	spin_unlock_irq(&b->lock);
@@ -565,8 +564,7 @@ static void defer_bio(struct cache *cache, struct bio *bio) 
static void defer_bios(struct cache *cache, struct bio_list *bios)

{

	spin_lock_irq(&cache->lock);

	bio_list_merge(&cache->deferred_bios, bios);

	bio_list_init(bios);

	bio_list_merge_init(&cache->deferred_bios, bios);

	spin_unlock_irq(&cache->lock);



	wake_deferred_bio_worker(cache);
@@ -1816,8 +1814,7 @@ static void process_deferred_bios(struct work_struct *ws) 
	bio_list_init(&bios);



	spin_lock_irq(&cache->lock);

	bio_list_merge(&bios, &cache->deferred_bios);

	bio_list_init(&cache->deferred_bios);

	bio_list_merge_init(&bios, &cache->deferred_bios);

	spin_unlock_irq(&cache->lock);



	while ((bio = bio_list_pop(&bios))) {
@@ -1847,8 +1844,7 @@ static void requeue_deferred_bios(struct cache *cache) 
	struct bio_list bios;



	bio_list_init(&bios);

	bio_list_merge(&bios, &cache->deferred_bios);

	bio_list_init(&cache->deferred_bios);

	bio_list_merge_init(&bios, &cache->deferred_bios);



	while ((bio = bio_list_pop(&bios))) {

		bio->bi_status = BLK_STS_DM_REQUEUE;

drivers/md/dm-clone-target.c

+5 −9
Original line number Diff line number Diff line
@@ -1181,8 +1181,7 @@ static void process_deferred_discards(struct clone *clone) 
	struct bio_list discards = BIO_EMPTY_LIST;



	spin_lock_irq(&clone->lock);

	bio_list_merge(&discards, &clone->deferred_discard_bios);

	bio_list_init(&clone->deferred_discard_bios);

	bio_list_merge_init(&discards, &clone->deferred_discard_bios);

	spin_unlock_irq(&clone->lock);



	if (bio_list_empty(&discards))
@@ -1215,8 +1214,7 @@ static void process_deferred_bios(struct clone *clone) 
	struct bio_list bios = BIO_EMPTY_LIST;



	spin_lock_irq(&clone->lock);

	bio_list_merge(&bios, &clone->deferred_bios);

	bio_list_init(&clone->deferred_bios);

	bio_list_merge_init(&bios, &clone->deferred_bios);

	spin_unlock_irq(&clone->lock);



	if (bio_list_empty(&bios))
@@ -1237,11 +1235,9 @@ static void process_deferred_flush_bios(struct clone *clone) 
	 * before issuing them or signaling their completion.

	 */

	spin_lock_irq(&clone->lock);

	bio_list_merge(&bios, &clone->deferred_flush_bios);

	bio_list_init(&clone->deferred_flush_bios);



	bio_list_merge(&bio_completions, &clone->deferred_flush_completions);

	bio_list_init(&clone->deferred_flush_completions);

	bio_list_merge_init(&bios, &clone->deferred_flush_bios);

	bio_list_merge_init(&bio_completions,

			    &clone->deferred_flush_completions);

	spin_unlock_irq(&clone->lock);



	if (bio_list_empty(&bios) && bio_list_empty(&bio_completions) &&

drivers/md/dm-era-target.c

+1 −2
Original line number Diff line number Diff line
@@ -1272,8 +1272,7 @@ static void process_deferred_bios(struct era *era) 
	bio_list_init(&marked_bios);



	spin_lock(&era->deferred_lock);

	bio_list_merge(&deferred_bios, &era->deferred_bios);

	bio_list_init(&era->deferred_bios);

	bio_list_merge_init(&deferred_bios, &era->deferred_bios);

	spin_unlock(&era->deferred_lock);



	if (bio_list_empty(&deferred_bios))

drivers/md/dm-mpath.c

+1 −2
Original line number Diff line number Diff line
@@ -704,8 +704,7 @@ static void process_queued_bios(struct work_struct *work) 
		return;

	}



	bio_list_merge(&bios, &m->queued_bios);

	bio_list_init(&m->queued_bios);

	bio_list_merge_init(&bios, &m->queued_bios);



	spin_unlock_irqrestore(&m->lock, flags);