cleanup: simpler checks first

Minor optimizatoins...

diff --git a/lib/format_text/archiver.c b/lib/format_text/archiver.c
index 932f97da312719b3d4d0448f993191fc3cccb301..68117f7dc38d5845d65e5dd9196561f266ad4b45 100644 (file)
--- a/lib/format_text/archiver.c
+++ b/lib/format_text/archiver.c
@@ -103,13 +103,13 @@ static int _archive(struct volume_group *vg, int compulsory)
 {
        char *desc;
 
+       if (vg_is_archived(vg))
+               return 1; /* VG has been already archived */
+
        /* Don't archive orphan VGs. */
        if (is_orphan_vg(vg->name))
                return 1;
 
-       if (vg_is_archived(vg))
-               return 1; /* VG has been already archived */
-
        if (!vg->cmd->archive_params->enabled || !vg->cmd->archive_params->dir) {
                vg->status |= ARCHIVED_VG;
                return 1;

diff --git a/lib/metadata/merge.c b/lib/metadata/merge.c
index eff59ae4b698a84f7ebda9b47b04d218c2150429..f29cf64ec66bf0ea4f2c294aec52b514f78e3b48 100644 (file)
--- a/lib/metadata/merge.c
+++ b/lib/metadata/merge.c
@@ -371,7 +371,7 @@ static void _check_lv_segment(struct logical_volume *lv, struct lv_segment *seg,
                        seg_error("sets cleaner_policy");
        }
 
-       if (lv_is_cache(lv) && seg->pool_lv && lv_is_cache_vol(seg->pool_lv)) {
+       if (seg->pool_lv && lv_is_cache(lv) && lv_is_cache_vol(seg->pool_lv)) {
                cache_setting_seg = seg;
                no_metadata_format = 1;
        }

diff --git a/lib/metadata/snapshot_manip.c b/lib/metadata/snapshot_manip.c
index 0f48e62e8e955ac924c7847ad549104645b18c5b..3ee5f4a86c368b97ffc7d1a0fa8c28c1097f320f 100644 (file)
--- a/lib/metadata/snapshot_manip.c
+++ b/lib/metadata/snapshot_manip.c
@@ -31,7 +31,7 @@ int lv_is_origin(const struct logical_volume *lv)
 int lv_is_cow(const struct logical_volume *lv)
 {
        /* Make sure a merging thin origin isn't confused as a cow LV */
-       return (!lv_is_thin_volume(lv) && !lv_is_origin(lv) && lv->snapshot) ? 1 : 0;
+       return (lv->snapshot && !lv_is_thin_volume(lv) && !lv_is_origin(lv)) ? 1 : 0;
 }
 
 struct logical_volume *find_cow(const struct logical_volume *snap)