Skip to content

Commit

Permalink
dm: use bio_list_merge_init
Browse files Browse the repository at this point in the history 
Use bio_list_merge_init instead of open coding bio_list_merge and
bio_list_init.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Mike Snitzer <snitzer@kernel.org>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20240328084147.2954434-4-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
Christoph Hellwig authored and Jens Axboe committed Apr 1, 2024
1 parent 7a324d8 commit 50bc215
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 36 deletions.
3 changes: 1 addition & 2 deletions drivers/md/dm-bio-prison-v2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 4 additions & 8 deletions drivers/md/dm-cache-target.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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))) {
Expand Down Expand Up @@ -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;
Expand Down
14 changes: 5 additions & 9 deletions drivers/md/dm-clone-target.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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))
Expand All @@ -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) &&
Expand Down
3 changes: 1 addition & 2 deletions drivers/md/dm-era-target.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
3 changes: 1 addition & 2 deletions drivers/md/dm-mpath.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
12 changes: 3 additions & 9 deletions drivers/md/dm-thin.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -592,12 +592,6 @@ struct dm_thin_endio_hook {
struct dm_bio_prison_cell *cell;
};

static void __merge_bio_list(struct bio_list *bios, struct bio_list *master)
{
bio_list_merge(bios, master);
bio_list_init(master);
}

static void error_bio_list(struct bio_list *bios, blk_status_t error)
{
struct bio *bio;
Expand All @@ -616,7 +610,7 @@ static void error_thin_bio_list(struct thin_c *tc, struct bio_list *master,
bio_list_init(&bios);

spin_lock_irq(&tc->lock);
__merge_bio_list(&bios, master);
bio_list_merge_init(&bios, master);
spin_unlock_irq(&tc->lock);

error_bio_list(&bios, error);
Expand Down Expand Up @@ -645,8 +639,8 @@ static void requeue_io(struct thin_c *tc)
bio_list_init(&bios);

spin_lock_irq(&tc->lock);
__merge_bio_list(&bios, &tc->deferred_bio_list);
__merge_bio_list(&bios, &tc->retry_on_resume_list);
bio_list_merge_init(&bios, &tc->deferred_bio_list);
bio_list_merge_init(&bios, &tc->retry_on_resume_list);
spin_unlock_irq(&tc->lock);

error_bio_list(&bios, BLK_STS_DM_REQUEUE);
Expand Down
3 changes: 1 addition & 2 deletions drivers/md/dm-vdo/data-vio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -604,8 +604,7 @@ static void assign_discard_permit(struct limiter *limiter)

static void get_waiters(struct limiter *limiter)
{
bio_list_merge(&limiter->waiters, &limiter->new_waiters);
bio_list_init(&limiter->new_waiters);
bio_list_merge_init(&limiter->waiters, &limiter->new_waiters);
}

static inline struct data_vio *get_available_data_vio(struct data_vio_pool *pool)
Expand Down
3 changes: 1 addition & 2 deletions drivers/md/dm-vdo/flush.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,7 @@ void vdo_dump_flusher(const struct flusher *flusher)
static void initialize_flush(struct vdo_flush *flush, struct vdo *vdo)
{
bio_list_init(&flush->bios);
bio_list_merge(&flush->bios, &vdo->flusher->waiting_flush_bios);
bio_list_init(&vdo->flusher->waiting_flush_bios);
bio_list_merge_init(&flush->bios, &vdo->flusher->waiting_flush_bios);
}

static void launch_flush(struct vdo_flush *flush)
Expand Down

0 comments on commit 50bc215

Please sign in to comment.