From 2dc75ed1af2f7022ef2b28c20803a7cc2bc0590c Mon Sep 17 00:00:00 2001
From: Milan Broz <mbroz@redhat.com>
Date: Thu, 12 Jul 2007 17:28:13 +0100
Subject: [PATCH] --- yaml --- r: 59284 b: refs/heads/master c:
 0764147b111b8ca886e4f2e9c9e019106b09b657 h: refs/heads/master v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/md/dm-exception-store.c | 11 ++++++-----
 trunk/drivers/md/dm-snap.c            |  5 ++++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 5caa1f9c90ff..6bbece2e9bf9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcac03abd325e4f7a4cc8fe05fea2793b1c8eb75
+refs/heads/master: 0764147b111b8ca886e4f2e9c9e019106b09b657
diff --git a/trunk/drivers/md/dm-exception-store.c b/trunk/drivers/md/dm-exception-store.c
index 8c25c2ff724a..3d65917a1bbb 100644
--- a/trunk/drivers/md/dm-exception-store.c
+++ b/trunk/drivers/md/dm-exception-store.c
@@ -489,17 +489,18 @@ static int persistent_read_metadata(struct exception_store *store)
 		/*
 		 * Sanity checks.
 		 */
-		if (!ps->valid) {
-			DMWARN("snapshot is marked invalid");
-			return -EINVAL;
-		}
-
 		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.
 		 */
diff --git a/trunk/drivers/md/dm-snap.c b/trunk/drivers/md/dm-snap.c
index 1da41229fbf2..854891d07b59 100644
--- a/trunk/drivers/md/dm-snap.c
+++ b/trunk/drivers/md/dm-snap.c
@@ -523,9 +523,12 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)
 
 	/* Metadata must only be loaded into one table at once */
 	r = s->store.read_metadata(&s->store);
-	if (r) {
+	if (r < 0) {
 		ti->error = "Failed to read snapshot metadata";
 		goto bad6;
+	} else if (r > 0) {
+		s->valid = 0;
+		DMWARN("Snapshot is marked invalid.");
 	}
 
 	bio_list_init(&s->queued_bios);