DM Snapshot: get rid of init_hash_tables fn
PATCH 1/1 DM Snapshot: get rid of init_hash_tables fn
Patch name: dm-snap-get-rid-of-init_hash_tables-fn.patch
init_hash_tables is an annoying function that just sets up one exception table... but it doesn't have a clear counterpart for tearing down - we simply call dm_exception_table_destroy. So, let's just get rid of it and save ourselves the confusion. [Doing so also makes future patches easier to read.]
Signed-off-by Jonathan Brassow <[email protected]>
drivers/md/dm-snap.c +23 -36
@@ -373,38 +373,6 @@ static int calc_max_buckets(void) }/* -* Allocate room for a suitable hash table. -*/ -static int init_hash_tables (struct dm_snapshot *s) -{ -sector_t hash_size, cow_dev_size, origin_dev_size, max_buckets; - -/* -* Calculate based on the size of the original volume or -* the COW volume... -*/ - cow_dev_size =get_dev_size (s->store->cow->bdev); - origin_dev_size =get_dev_size (s->origin->bdev); - max_buckets =calc_max_buckets (); - - hash_size =min (origin_dev_size, cow_dev_size) >> s->store->chunk_shift; - hash_size =min (hash_size, max_buckets); - - hash_size =rounddown_pow_of_two (hash_size); - hash_size >>=3 ; -if (hash_size <64 ) - hash_size =64 ; - - s->pending =dm_exception_table_create (hash_size,0 , - alloc_pending_exception, s, - free_pending_exception,NULL ); -if (!s->pending) -return -ENOMEM ; - -return 0 ; -} - -/* * create_exception_store * @ti * @argc
@@ -477,6 +445,7 @@ static int create_exception_store(struct*/ static int snapshot_ctr (struct dm_target *ti,unsigned int argc,char **argv) { +sector_t hash_size, cow_dev_size, origin_dev_size, max_buckets;struct dm_snapshot *s;int i;int r = -EINVAL ;
@@ -520,11 +489,29 @@ static int snapshot_ctr(struct dm_targetinit_rwsem (&s->lock);spin_lock_init (&s->pe_lock); -/* Allocate hash table for COW data */ -if (init_hash_tables (s)) { +/* +* Calculate based on the size of the original volume or +* the COW volume... +*/ + cow_dev_size =get_dev_size (store->cow->bdev); + origin_dev_size =get_dev_size (s->origin->bdev); + max_buckets =calc_max_buckets (); + + hash_size =min (origin_dev_size, cow_dev_size) >> store->chunk_shift; + hash_size =min (hash_size, max_buckets); + + hash_size =rounddown_pow_of_two (hash_size); + hash_size >>=3 ; +if (hash_size <64 ) + hash_size =64 ; + + s->pending =dm_exception_table_create (hash_size,0 , + alloc_pending_exception, s, + free_pending_exception,NULL ); +if (!s->pending) { ti->error ="Unable to allocate hash table space" ; r = -ENOMEM ; - goto bad_hash_tables; + goto bad_hash_table; } r =dm_kcopyd_client_create (SNAPSHOT_PAGES , &s->kcopyd_client);
@@ -579,7 +566,7 @@ bad_pending_pool: bad_kcopyd:dm_exception_table_destroy (s->pending); -bad_hash_tables: +bad_hash_table:dm_put_device (ti, s->origin); bad_origin: