Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d32a6ea6 authored by Jon Brassow's avatar Jon Brassow Committed by Alasdair G Kergon
Browse files

dm snapshot: consolidate insert exception functions 



Consolidate the insert_*exception functions.  'insert_completed_exception'
already contains all the logic to handle 'insert_exception' (via
check for a hash_shift of 0), so remove redundant function.

Signed-off-by: default avatarJonathan Brassow <jbrassow@redhat.com>
Reviewed-by: default avatarMike Snitzer <snitzer@redhat.com>
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
parent 7e201b35

drivers/md/dm-snap.c

+4 −12
Original line number Diff line number Diff line
@@ -390,13 +390,6 @@ static uint32_t exception_hash(struct exception_table *et, chunk_t chunk) 
	return (chunk >> et->hash_shift) & et->hash_mask;

}



static void insert_exception(struct exception_table *eh,

			     struct dm_snap_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_snap_exception *e)

{

	list_del(&e->hash_list);
@@ -457,10 +450,9 @@ static void free_pending_exception(struct dm_snap_pending_exception *pe) 
	atomic_dec(&s->pending_exceptions_count);

}



static void insert_completed_exception(struct dm_snapshot *s,

static void insert_exception(struct exception_table *eh,

			     struct dm_snap_exception *new_e)

{

	struct exception_table *eh = &s->complete;

	struct list_head *l;

	struct dm_snap_exception *e = NULL;
@@ -518,7 +510,7 @@ static int dm_add_exception(void *context, chunk_t old, chunk_t new) 
	/* Consecutive_count is implicitly initialised to zero */

	e->new_chunk = new;



	insert_completed_exception(s, e);

	insert_exception(&s->complete, e);



	return 0;

}
@@ -925,7 +917,7 @@ static void pending_complete(struct dm_snap_pending_exception *pe, int success) 
	 * 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);