lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dm snapshot: permit invalid activation

Browse Source 
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.

Cc: stable@kernel.org
Signed-off-by: Milan Broz <mbroz@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Milan Broz
2007-07-12 17:28:13 +01:00
committed by Linus Torvalds
parent fcac03abd3
commit 0764147b11
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/md/dm-exception-store.c
View File

@@ -489,17 +489,18 @@ static int persistent_read_metadata(struct exception_store *store)
/* /*
* Sanity checks. * Sanity checks.
*/ */
if (!ps->valid) {
DMWARN("snapshot is marked invalid");
return -EINVAL;
}
if (ps->version != SNAPSHOT_DISK_VERSION) { if (ps->version != SNAPSHOT_DISK_VERSION) {
DMWARN("unable to handle snapshot disk version %d", DMWARN("unable to handle snapshot disk version %d",
ps->version); ps->version);
return -EINVAL; return -EINVAL;
} }
/*
* Metadata are valid, but snapshot is invalidated
*/
if (!ps->valid)
return 1;
/* /*
* Read the metadata. * Read the metadata.
*/ */

5
drivers/md/dm-snap.c
View File

@@ -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 */ /* Metadata must only be loaded into one table at once */
r = s->store.read_metadata(&s->store); r = s->store.read_metadata(&s->store);
if (r) { if (r < 0) {
ti->error = "Failed to read snapshot metadata"; ti->error = "Failed to read snapshot metadata";
goto bad6; goto bad6;
} else if (r > 0) {
s->valid = 0;
DMWARN("Snapshot is marked invalid.");
} }
bio_list_init(&s->queued_bios); bio_list_init(&s->queued_bios);