diff options
| author | Milan Broz <mbroz@redhat.com> | 2007-07-12 17:28:13 +0100 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2007-08-25 17:24:15 +0200 |
| commit | f4c146b686810ba345b72ca3e2a0c74586838f1c (patch) | |
| tree | 534dd2516b5c6a140dac621388cff627d36174b6 | |
| parent | f83801d9974cda3172c4ca9c72ca39940df30f47 (diff) | |
| download | lwn-f4c146b686810ba345b72ca3e2a0c74586838f1c.tar.gz lwn-f4c146b686810ba345b72ca3e2a0c74586838f1c.zip | |
[PATCH] dm snapshot: permit invalid activation
Allow invalid snapshots to be activated instead of failing.
This allows userspace to reinstate any given snapshot state - for
example after an unscheduled reboot - and clean up the invalid snapshot
at its leisure.
Signed-off-by: Milan Broz <mbroz@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -rw-r--r-- | drivers/md/dm-exception-store.c | 11 | ||||
| -rw-r--r-- | drivers/md/dm-snap.c | 5 |
2 files changed, 10 insertions, 6 deletions
diff --git a/drivers/md/dm-exception-store.c b/drivers/md/dm-exception-store.c index 99cdffa7fbfe..fc496fcaa2e1 100644 --- a/drivers/md/dm-exception-store.c +++ b/drivers/md/dm-exception-store.c @@ -453,11 +453,6 @@ 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); @@ -465,6 +460,12 @@ static int persistent_read_metadata(struct exception_store *store) } /* + * Metadata are valid, but snapshot is invalidated + */ + if (!ps->valid) + return 1; + + /* * Read the metadata. */ r = read_exceptions(ps); diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c index 0821a2b68a73..9227ba4f19db 100644 --- a/drivers/md/dm-snap.c +++ b/drivers/md/dm-snap.c @@ -522,9 +522,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); |