DM Snapshot: persistent store minor code cleanup
PATCH 1/1 DM Snapshot: persistent store minor code cleanup
Patch name: dm-snap-persistent-store-minor-code-cleanup.patch
Minor code clean-up. Streamlines code and makes next patch easier to review.
Signed-off-by Jonathan Brassow <[email protected]>
drivers/md/dm-snap-persistent.c +22 -26
@@ -536,35 +536,31 @@ static int persistent_read_metadata(stru ps->current_area =0 ;zero_memory_area (ps); r =zero_disk_area (ps,0 ); -if (r) { -DMWARN ("zero_disk_area(0) failed" ); -return r; - } - }else { -/* -* Sanity checks. -*/ -if (ps->version !=SNAPSHOT_DISK_VERSION ) { -DMWARN ("unable to handle snapshot disk version %d" , - ps->version); -return -EINVAL ; - } - -/* -* Metadata are valid, but snapshot is invalidated -*/ -if (!ps->valid) -return 1 ; - -/* -* Read the metadata. -*/ - r =read_exceptions (ps, callback, callback_context);if (r) -return r; +DMWARN ("zero_disk_area(0) failed" ); +return r; + } +/* +* Sanity checks. +*/ +if (ps->version !=SNAPSHOT_DISK_VERSION ) { +DMWARN ("unable to handle snapshot disk version %d" , + ps->version); +return -EINVAL ; } -return 0 ; +/* +* Metadata are valid, but snapshot is invalidated +*/ +if (!ps->valid) +return 1 ; + +/* +* Read the metadata. +*/ + r =read_exceptions (ps, callback, callback_context); + +return r; } static int persistent_prepare_exception(struct dm_exception_store *store,