From patchwork Tue Mar 17 14:04:01 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonthan Brassow X-Patchwork-Id: 12612 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 n2HE46d0018554 for ; Tue, 17 Mar 2009 14:04:06 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 CD025619B05; Tue, 17 Mar 2009 10:04:06 -0400 (EDT) Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id n2HE445g023168 for ; Tue, 17 Mar 2009 10:04:04 -0400 Received: from hydrogen.msp.redhat.com (hydrogen.msp.redhat.com [10.15.80.1]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n2HE43Bs006273 for ; Tue, 17 Mar 2009 10:04:03 -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 n2HE41wj017412 for ; Tue, 17 Mar 2009 09:04:01 -0500 Received: (from jbrassow@localhost) by hydrogen.msp.redhat.com (8.14.1/8.14.1/Submit) id n2HE418r017410 for dm-devel@redhat.com; Tue, 17 Mar 2009 09:04:01 -0500 Date: Tue, 17 Mar 2009 09:04:01 -0500 From: Jonathan Brassow Message-Id: <200903171404.n2HE418r017410@hydrogen.msp.redhat.com> To: dm-devel@redhat.com X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 X-loop: dm-devel@redhat.com Subject: [dm-devel] [PATCH 11 of 29] dm-snap-exception-function-changes-6.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 @@ -945,6 +945,7 @@ static void get_pending_exception(struct static struct bio *put_pending_exception(struct dm_snap_pending_exception *pe) { struct dm_snap_pending_exception *primary_pe; + struct dm_snapshot *s = pe->snap; struct bio *origin_bios = NULL; primary_pe = pe->primary_pe; @@ -957,7 +958,7 @@ static struct bio *put_pending_exception if (primary_pe && atomic_dec_and_test(&primary_pe->ref_count)) { origin_bios = bio_list_get(&primary_pe->origin_bios); - free_pending_exception(&primary_pe->e, NULL); + dm_free_exception(s->pending, &primary_pe->e); } /* @@ -965,7 +966,7 @@ static struct bio *put_pending_exception * it's not itself a primary pe. */ if (!primary_pe || primary_pe != pe) - free_pending_exception(&pe->e, NULL); + dm_free_exception(s->pending, &pe->e); return origin_bios; } @@ -1111,18 +1112,18 @@ __find_pending_exception(struct dm_snaps * to hold the lock while we do this. */ up_write(&s->lock); - tmp_e = alloc_pending_exception(s); + tmp_e = dm_alloc_exception(s->pending); pe = container_of(tmp_e, struct dm_snap_pending_exception, e); down_write(&s->lock); if (!s->valid) { - free_pending_exception(&pe->e, NULL); + dm_free_exception(s->pending, &pe->e); return NULL; } e = dm_lookup_exception(s->pending, chunk); if (e) { - free_pending_exception(&pe->e, NULL); + dm_free_exception(s->pending, &pe->e); pe = container_of(e, struct dm_snap_pending_exception, e); goto out; } @@ -1135,7 +1136,7 @@ __find_pending_exception(struct dm_snaps pe->started = 0; if (s->store->type->prepare_exception(s->store, &pe->e)) { - free_pending_exception(&pe->e, NULL); + dm_free_exception(s->pending, &pe->e); return NULL; } @@ -1378,7 +1379,8 @@ static int __origin_write(struct list_he if (first && atomic_dec_and_test(&primary_pe->ref_count)) { flush_bios(bio_list_get(&primary_pe->origin_bios)); - free_pending_exception(&primary_pe->e, NULL); + dm_free_exception(primary_pe->snap->pending, + &primary_pe->e); /* If we got here, pe_queue is necessarily empty. */ return r; }