diff options
| author | Mikulas Patocka | 2019-04-29 14:57:22 +0200 |
|---|---|---|
| committer | Mike Snitzer | 2019-05-08 13:40:28 -0400 |
| commit | 8b3bbd490d880db1377c71daf9c929c8446c8375 (patch) | |
| tree | dcc69d8d58075dbb2a38a60803965edbddbbe1e5 /drivers/md | |
| parent | 4f43446ddff056df237a8ee9257ec94baeed909d (diff) | |
dm integrity: introduce a function add_new_range_and_wait()
Introduce a function add_new_range_and_wait() in order to avoid
repetitive code. It will be used in the following commit.
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/dm-integrity.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c index 0dcced588c42..fb8935d80842 100644 --- a/drivers/md/dm-integrity.c +++ b/drivers/md/dm-integrity.c @@ -1001,6 +1001,12 @@ static void wait_and_add_new_range(struct dm_integrity_c *ic, struct dm_integrit } while (unlikely(new_range->waiting)); } +static void add_new_range_and_wait(struct dm_integrity_c *ic, struct dm_integrity_range *new_range) +{ + if (unlikely(!add_new_range(ic, new_range, true))) + wait_and_add_new_range(ic, new_range); +} + static void init_journal_node(struct journal_node *node) { RB_CLEAR_NODE(&node->node); @@ -1995,8 +2001,7 @@ static void do_journal_write(struct dm_integrity_c *ic, unsigned write_start, io->range.n_sectors = (k - j) << ic->sb->log2_sectors_per_block; spin_lock_irq(&ic->endio_wait.lock); - if (unlikely(!add_new_range(ic, &io->range, true))) - wait_and_add_new_range(ic, &io->range); + add_new_range_and_wait(ic, &io->range); if (likely(!from_replay)) { struct journal_node *section_node = &ic->journal_tree[i * ic->journal_section_entries]; @@ -2155,8 +2160,7 @@ next_chunk: if (!ic->meta_dev) range.n_sectors = min(range.n_sectors, ((sector_t)1U << ic->sb->log2_interleave_sectors) - (unsigned)offset); - if (unlikely(!add_new_range(ic, &range, true))) - wait_and_add_new_range(ic, &range); + add_new_range_and_wait(ic, &range); spin_unlock_irq(&ic->endio_wait.lock); |