Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Mikulas Patocka and committed by
Mike Snitzer
8b3bbd49 4f43446d

+8 -4
+8 -4
drivers/md/dm-integrity.c
··· 1001 1001 } while (unlikely(new_range->waiting)); 1002 1002 } 1003 1003 1004 + static void add_new_range_and_wait(struct dm_integrity_c *ic, struct dm_integrity_range *new_range) 1005 + { 1006 + if (unlikely(!add_new_range(ic, new_range, true))) 1007 + wait_and_add_new_range(ic, new_range); 1008 + } 1009 + 1004 1010 static void init_journal_node(struct journal_node *node) 1005 1011 { 1006 1012 RB_CLEAR_NODE(&node->node); ··· 2001 1995 io->range.n_sectors = (k - j) << ic->sb->log2_sectors_per_block; 2002 1996 2003 1997 spin_lock_irq(&ic->endio_wait.lock); 2004 - if (unlikely(!add_new_range(ic, &io->range, true))) 2005 - wait_and_add_new_range(ic, &io->range); 1998 + add_new_range_and_wait(ic, &io->range); 2006 1999 2007 2000 if (likely(!from_replay)) { 2008 2001 struct journal_node *section_node = &ic->journal_tree[i * ic->journal_section_entries]; ··· 2160 2155 if (!ic->meta_dev) 2161 2156 range.n_sectors = min(range.n_sectors, ((sector_t)1U << ic->sb->log2_interleave_sectors) - (unsigned)offset); 2162 2157 2163 - if (unlikely(!add_new_range(ic, &range, true))) 2164 - wait_and_add_new_range(ic, &range); 2158 + add_new_range_and_wait(ic, &range); 2165 2159 2166 2160 spin_unlock_irq(&ic->endio_wait.lock); 2167 2161