From patchwork Tue Mar 17 14:04:21 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jonthan Brassow <jbrassow@redhat.com>
X-Patchwork-Id: 12614
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 n2HE4Ph7018580
	for <patchwork-dm-devel@patchwork.kernel.org>;
	Tue, 17 Mar 2009 14:04:25 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 D823F619B1E;
	Tue, 17 Mar 2009 10:04: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
	n2HE4OpD023192 for <dm-devel@listman.util.phx.redhat.com>;
	Tue, 17 Mar 2009 10:04: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
	n2HE4L5u011252
	for <dm-devel@redhat.com>; Tue, 17 Mar 2009 10:04: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
	n2HE4L5q017429
	for <dm-devel@redhat.com>; Tue, 17 Mar 2009 09:04:21 -0500
Received: (from jbrassow@localhost)
	by hydrogen.msp.redhat.com (8.14.1/8.14.1/Submit) id n2HE4LYo017427
	for dm-devel@redhat.com; Tue, 17 Mar 2009 09:04:21 -0500
Date: Tue, 17 Mar 2009 09:04:21 -0500
From: Jonathan Brassow <jbrassow@redhat.com>
Message-Id: <200903171404.n2HE4LYo017427@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 13 of 29]
	dm-snap-persistent-minor-code-cleanup.patch
X-BeenThere: dm-devel@redhat.com
X-Mailman-Version: 2.1.5
Precedence: junk
Reply-To: device-mapper development <dm-devel@redhat.com>
List-Id: device-mapper development <dm-devel.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/listinfo/dm-devel>,
	<mailto:dm-devel-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/dm-devel>
List-Post: <mailto:dm-devel@redhat.com>
List-Help: <mailto:dm-devel-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/dm-devel>,
	<mailto:dm-devel-request@redhat.com?subject=subscribe>
Sender: dm-devel-bounces@redhat.com
Errors-To: dm-devel-bounces@redhat.com

Minor code clean-up.  Streamlines code and makes next patch easier
to review.

Signed-off-by: Jonathan Brassow <jbrassow@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-persistent.c
===================================================================
--- linux-2.6.orig/drivers/md/dm-snap-persistent.c
+++ linux-2.6/drivers/md/dm-snap-persistent.c
@@ -536,35 +536,31 @@ static int persistent_read_metadata(stru
 		ps->current_area = 0;
 		zero_memory_area(ps);
 		r = zero_disk_area(ps, 0);
-		if (r) {
-			DMWARN("zero_disk_area(0) failed");
-			return r;
-		}
-	} else {
-		/*
-		 * Sanity checks.
-		 */
-		if (ps->version != SNAPSHOT_DISK_VERSION) {
-			DMWARN("unable to handle snapshot disk version %d",
-			       ps->version);
-			return -EINVAL;
-		}
-
-		/*
-		 * Metadata are valid, but snapshot is invalidated
-		 */
-		if (!ps->valid)
-			return 1;
-
-		/*
-		 * Read the metadata.
-		 */
-		r = read_exceptions(ps, callback, callback_context);
 		if (r)
-			return r;
+			DMWARN("zero_disk_area(0) failed");
+		return r;
+	}
+	/*
+	 * Sanity checks.
+	 */
+	if (ps->version != SNAPSHOT_DISK_VERSION) {
+		DMWARN("unable to handle snapshot disk version %d",
+		       ps->version);
+		return -EINVAL;
 	}
 
-	return 0;
+	/*
+	 * Metadata are valid, but snapshot is invalidated
+	 */
+	if (!ps->valid)
+		return 1;
+
+	/*
+	 * Read the metadata.
+	 */
+	r = read_exceptions(ps, callback, callback_context);
+
+	return r;
 }
 
 static int persistent_prepare_exception(struct dm_exception_store *store,