Patch name: dm-snap-consolidate-insert_exception-functions.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 <jbrassow@xxxxxxxxxx>
Index: linux-2.6/drivers/md/dm-snap.c
===================================================================
--- linux-2.6.orig/drivers/md/dm-snap.c
+++ linux-2.6/drivers/md/dm-snap.c
@@ -387,13 +387,6 @@ static uint32_t exception_hash(struct dm
return (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);
@@ -454,10 +447,9 @@ static void free_pending_exception(struc
atomic_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;
@@ -515,7 +507,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;
}
@@ -957,7 +949,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);
--
dm-devel mailing list
dm-devel@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/dm-devel
