From patchwork Tue Sep 29 22:53:36 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Snitzer X-Patchwork-Id: 50627 Received: from hormel.redhat.com (hormel1.redhat.com [209.132.177.33]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8TMsDXJ017344 for ; Tue, 29 Sep 2009 22:54:14 GMT Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110]) by hormel.redhat.com (Postfix) with ESMTP id F29B561B160; Tue, 29 Sep 2009 18:53:57 -0400 (EDT) Received: from int-mx05.intmail.prod.int.phx2.redhat.com (nat-pool.util.phx.redhat.com [10.8.5.200]) by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id n8TMrqI8030542 for ; Tue, 29 Sep 2009 18:53:52 -0400 Received: from localhost (dhcp-100-18-171.bos.redhat.com [10.16.18.171]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8TMrpro009935; Tue, 29 Sep 2009 18:53:51 -0400 From: Mike Snitzer To: dm-devel@redhat.com Date: Tue, 29 Sep 2009 18:53:36 -0400 Message-Id: <1254264823-11538-12-git-send-email-snitzer@redhat.com> In-Reply-To: <1254264823-11538-1-git-send-email-snitzer@redhat.com> References: <1254264823-11538-1-git-send-email-snitzer@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-loop: dm-devel@redhat.com Cc: Subject: [dm-devel] [PATCH 11/18] dm-snapshot-exception-function-changes-4 X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.5 Precedence: junk Reply-To: device-mapper development List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c index 1a664ec..2ec51b6 100644 --- a/drivers/md/dm-snap.c +++ b/drivers/md/dm-snap.c @@ -358,7 +358,11 @@ struct dm_exception_table_internal { * some consecutive chunks to be grouped together. */ static struct dm_exception_table * -dm_exception_table_create(uint32_t size, unsigned hash_shift) +dm_exception_table_create(uint32_t size, unsigned hash_shift, + struct dm_exception *(*alloc_exception)(void *), + void *alloc_context, + void (*free_exception)(struct dm_exception *e, void *), + void *free_context) { unsigned int i; struct dm_exception_table_internal *eti; @@ -378,14 +382,18 @@ dm_exception_table_create(uint32_t size, unsigned hash_shift) return NULL; } + eti->alloc_exception = alloc_exception; + eti->alloc_context = alloc_context; + eti->free_exception = free_exception; + eti->free_context = free_context; + for (i = 0; i < size; i++) INIT_LIST_HEAD(et->table + i); return et; } -static void dm_exception_table_destroy(struct dm_exception_table *et, - struct kmem_cache *mem) +static void dm_exception_table_destroy(struct dm_exception_table *et) { struct dm_exception_table_internal *eti; struct list_head *slot; @@ -399,7 +407,7 @@ static void dm_exception_table_destroy(struct dm_exception_table *et, slot = et->table + i; list_for_each_entry_safe (ex, next, slot, hash_list) - kmem_cache_free(mem, ex); + eti->free_exception(ex, eti->free_context); } vfree(et->table); @@ -593,7 +601,9 @@ static int init_hash_tables(struct dm_snapshot *s) hash_size = rounddown_pow_of_two(hash_size); s->complete = dm_exception_table_create(hash_size, - DM_CHUNK_CONSECUTIVE_BITS); + DM_CHUNK_CONSECUTIVE_BITS, + alloc_completed_exception, NULL, + free_completed_exception, NULL); if (!s->complete) return -ENOMEM; @@ -605,9 +615,11 @@ static int init_hash_tables(struct dm_snapshot *s) if (hash_size < 64) hash_size = 64; - s->pending = dm_exception_table_create(hash_size, 0); + s->pending = dm_exception_table_create(hash_size, 0, + alloc_pending_exception, s, + free_pending_exception, NULL); if (!s->pending) { - dm_exception_table_destroy(s->complete, exception_cache); + dm_exception_table_destroy(s->complete); return -ENOMEM; } @@ -799,8 +811,8 @@ bad_pending_pool: dm_kcopyd_client_destroy(s->kcopyd_client); bad_kcopyd: - dm_exception_table_destroy(s->pending, pending_cache); - dm_exception_table_destroy(s->complete, exception_cache); + dm_exception_table_destroy(s->pending); + dm_exception_table_destroy(s->complete); bad_hash_tables: dm_put_device(ti, s->origin); @@ -819,8 +831,8 @@ static void __free_exceptions(struct dm_snapshot *s) dm_kcopyd_client_destroy(s->kcopyd_client); s->kcopyd_client = NULL; - dm_exception_table_destroy(s->pending, pending_cache); - dm_exception_table_destroy(s->complete, exception_cache); + dm_exception_table_destroy(s->pending); + dm_exception_table_destroy(s->complete); } static void snapshot_dtr(struct dm_target *ti)