Messages in this thread Patch in this message | | | Date | Tue, 7 Aug 2007 13:49:07 -0700 | From | Greg KH <> | Subject | [2.6.22.2 review 72/84] dm snapshot: permit invalid activation |
| |
From: Milan Broz <mbroz@redhat.com>
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>
--- drivers/md/dm-exception-store.c | 11 ++++++----- drivers/md/dm-snap.c | 5 ++++- 2 files changed, 10 insertions(+), 6 deletions(-)
--- a/drivers/md/dm-exception-store.c +++ b/drivers/md/dm-exception-store.c @@ -457,11 +457,6 @@ static int persistent_read_metadata(stru /* * 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); @@ -469,6 +464,12 @@ static int persistent_read_metadata(stru } /* + * Metadata are valid, but snapshot is invalidated + */ + if (!ps->valid) + return 1; + + /* * Read the metadata. */ r = read_exceptions(ps); --- a/drivers/md/dm-snap.c +++ b/drivers/md/dm-snap.c @@ -522,9 +522,12 @@ static int snapshot_ctr(struct dm_target /* 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); -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |