From patchwork Tue Mar 17 14:06:21 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonthan Brassow X-Patchwork-Id: 12626 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 n2HE6Qcf018805 for ; Tue, 17 Mar 2009 14:06:26 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 09F66619C00; Tue, 17 Mar 2009 10:06:25 -0400 (EDT) Received: from int-mx2.corp.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 n2HE6NEL023793 for ; Tue, 17 Mar 2009 10:06:24 -0400 Received: from hydrogen.msp.redhat.com (hydrogen.msp.redhat.com [10.15.80.1]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n2HE6MEF012574 for ; Tue, 17 Mar 2009 10:06:22 -0400 Received: from hydrogen.msp.redhat.com (localhost.localdomain [127.0.0.1]) by hydrogen.msp.redhat.com (8.14.1/8.14.1) with ESMTP id n2HE6L0p017528 for ; Tue, 17 Mar 2009 09:06:21 -0500 Received: (from jbrassow@localhost) by hydrogen.msp.redhat.com (8.14.1/8.14.1/Submit) id n2HE6LNQ017526 for dm-devel@redhat.com; Tue, 17 Mar 2009 09:06:21 -0500 Date: Tue, 17 Mar 2009 09:06:21 -0500 From: Jonathan Brassow Message-Id: <200903171406.n2HE6LNQ017526@hydrogen.msp.redhat.com> To: dm-devel@redhat.com X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 X-loop: dm-devel@redhat.com Subject: [dm-devel] [PATCH 25 of 29] dm-snap-get-rid-of-__free_exceptions-fn.patch 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 -- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel 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 @@ -578,14 +578,6 @@ bad_snap: return r; } -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); -} - static void snapshot_dtr(struct dm_target *ti) { #ifdef CONFIG_DM_DEBUG @@ -614,7 +606,10 @@ static void snapshot_dtr(struct dm_targe mempool_destroy(s->tracked_chunk_pool); - __free_exceptions(s); + dm_kcopyd_client_destroy(s->kcopyd_client); + s->kcopyd_client = NULL; + + dm_exception_table_destroy(s->pending); mempool_destroy(s->pending_pool);