dm-snap-consolidate-insert_exception.patch
PATCH 1/1 dm-snap-consolidate-insert_exception.patch
It is ridiculous to have two 'insert_*exception' functions when one of the functions already handles both cases. Consolidating them.
Signed-off-by Jonathan Brassow <[email protected]>
drivers/md/dm-snap.c +4 -12
@@ -388,13 +388,6 @@ static uint32_t exception_hash(struct dmreturn (chunk >> et->hash_shift) & et->hash_mask; } -static void insert_exception (struct dm_exception_table *eh, -struct dm_exception *e) -{ -struct list_head *l = &eh->table[exception_hash (eh, e->old_chunk)]; -list_add (&e->hash_list, l); -} -static void remove_exception (struct dm_exception *e) {list_del (&e->hash_list);
@@ -455,10 +448,9 @@ static void free_pending_exception(strucatomic_dec (&s->pending_exceptions_count); } -static void insert_completed_exception (struct dm_snapshot *s, -struct dm_exception *new_e) +static void insert_exception (struct dm_exception_table *eh, +struct dm_exception *new_e) { -struct dm_exception_table *eh = &s->complete;struct list_head *l;struct dm_exception *e =NULL ;
@@ -516,7 +508,7 @@ static int dm_add_exception(void *contex/* Consecutive_count is implicitly initialised to zero */ e->new_chunk = new; -insert_completed_exception (s, e); +insert_exception (&s->complete, e);return 0 ; }
@@ -958,7 +950,7 @@ static void pending_complete(struct dm_s* Add a proper exception, and remove the * in-flight exception from the list. */ -insert_completed_exception (s, e); +insert_exception (&s->complete, e); out:remove_exception (&pe->e);