From f0e9ef4eec54387bc9cc4b4a6f6dda7a82875d73 Mon Sep 17 00:00:00 2001
From: Jon Brassow <jbrassow@redhat.com>
Date: Thu, 10 Dec 2009 23:52:07 +0000
Subject: [PATCH] --- yaml --- r: 176531 b: refs/heads/master c:
 f5acc834287dd4f6cf712093ce0e779e38caad70 h: refs/heads/master i:   176529:
 d95e33afc26cdb9497c7909041e7910234ffda1d   176527:
 d993c061eb9616f4c9eb4751557e36d9c6743fcc v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/md/dm-snap-persistent.c | 46 ++++++++++++---------------
 2 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/[refs] b/[refs]
index 4ff5d95b02ca..798beaac745c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a518b86d0b1b6a474f154697dc6f33e0a317ae72
+refs/heads/master: f5acc834287dd4f6cf712093ce0e779e38caad70
diff --git a/trunk/drivers/md/dm-snap-persistent.c b/trunk/drivers/md/dm-snap-persistent.c
index 0c746420c008..7e855fbeb22e 100644
--- a/trunk/drivers/md/dm-snap-persistent.c
+++ b/trunk/drivers/md/dm-snap-persistent.c
@@ -552,35 +552,31 @@ static int persistent_read_metadata(struct dm_exception_store *store,
 		ps->current_area = 0;
 		zero_memory_area(ps);
 		r = zero_disk_area(ps, 0);
-		if (r) {
+		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;
-		}
+		return r;
+	}
+	/*
+	 * 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;
+	/*
+	 * 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;
-	}
+	/*
+	 * Read the metadata.
+	 */
+	r = read_exceptions(ps, callback, callback_context);
 
-	return 0;
+	return r;
 }
 
 static int persistent_prepare_exception(struct dm_exception_store *store,