Commit f5acc834 authored by Jon Brassow's avatar Jon Brassow Committed by Alasdair G Kergon

dm snapshot: avoid else clause in persistent_read_metadata

Minor code touch-up.  We don't need the 'else'.
Signed-off-by: default avatarJonathan Brassow <jbrassow@redhat.com>
Reviewed-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Reviewed-by: default avatarMike Snitzer <snitzer@redhat.com>
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
parent a518b86d
...@@ -552,35 +552,31 @@ static int persistent_read_metadata(struct dm_exception_store *store, ...@@ -552,35 +552,31 @@ static int persistent_read_metadata(struct dm_exception_store *store,
ps->current_area = 0; ps->current_area = 0;
zero_memory_area(ps); zero_memory_area(ps);
r = zero_disk_area(ps, 0); r = zero_disk_area(ps, 0);
if (r) { if (r)
DMWARN("zero_disk_area(0) failed"); DMWARN("zero_disk_area(0) failed");
return r; return r;
} }
} else { /*
/* * Sanity checks.
* Sanity checks. */
*/ 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 * Metadata are valid, but snapshot is invalidated
*/ */
if (!ps->valid) if (!ps->valid)
return 1; return 1;
/* /*
* Read the metadata. * Read the metadata.
*/ */
r = read_exceptions(ps, callback, callback_context); r = read_exceptions(ps, callback, callback_context);
if (r)
return r;
}
return 0; return r;
} }
static int persistent_prepare_exception(struct dm_exception_store *store, static int persistent_prepare_exception(struct dm_exception_store *store,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment