Messages in this thread Patch in this message | | | Date | Thu, 14 Sep 2006 22:39:00 +0100 | From | Alasdair G Kergon <> | Subject | [PATCH 04/25] dm snapshot: fix metadata error handling |
| |
From: Mark McLoughlin <markmc@redhat.com>
Fix the error handling when store.read_metadata is called: the error should be returned immediately.
Signed-off-by: Mark McLoughlin <markmc@redhat.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Index: linux-2.6.18-rc7/drivers/md/dm-snap.c =================================================================== --- linux-2.6.18-rc7.orig/drivers/md/dm-snap.c 2006-09-14 20:38:48.000000000 +0100 +++ linux-2.6.18-rc7/drivers/md/dm-snap.c 2006-09-14 20:38:50.000000000 +0100 @@ -387,17 +387,6 @@ static inline ulong round_up(ulong n, ul 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 } /* 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 */ - 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/
| |