From: Mark McLoughlin Date: Tue, 3 Oct 2006 08:15:25 +0000 (-0700) Subject: [PATCH] dm snapshot: fix metadata error handling X-Git-Tag: v2.6.19-rc1~275 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=f9cea4f70734f743e0beb55552a9794fa5032645;p=linux-2.6-omap-h63xx.git [PATCH] dm snapshot: fix metadata error handling Fix the error handling when store.read_metadata is called: the error should be returned immediately. Signed-off-by: Mark McLoughlin Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c index 89f8dd1bfaa..58c444fb189 100644 --- a/drivers/md/dm-snap.c +++ b/drivers/md/dm-snap.c @@ -387,17 +387,6 @@ static inline ulong round_up(ulong n, ulong size) return (n + size) & ~size; } -static void read_snapshot_metadata(struct dm_snapshot *s) -{ - if (s->store.read_metadata(&s->store)) { - down_write(&s->lock); - s->valid = 0; - up_write(&s->lock); - - dm_table_event(s->table); - } -} - static int set_chunk_size(struct dm_snapshot *s, const char *chunk_size_arg, char **error) { @@ -528,7 +517,11 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv) } /* Metadata must only be loaded into one table at once */ - read_snapshot_metadata(s); + r = s->store.read_metadata(&s->store); + if (r) { + ti->error = "Failed to read snapshot metadata"; + goto bad6; + } /* Add snapshot to the list of snapshots for this origin */ /* Exceptions aren't triggered till snapshot_resume() is called */