From 5af311ddd8f5c03839b1c2a8feff5eb8dfde5606 Mon Sep 17 00:00:00 2001 From: Alasdair G Kergon Date: Thu, 14 Jul 2016 14:21:01 +0100 Subject: [PATCH] macros: Add lv_is_not_synced. --- lib/metadata/lv.c | 4 ++-- lib/metadata/lv_manip.c | 2 +- lib/metadata/metadata-exported.h | 1 + lib/metadata/raid_manip.c | 2 +- lib/report/report.c | 2 +- tools/lvchange.c | 2 +- tools/lvconvert.c | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c index e7a56cf71..9ee67b4d2 100644 --- a/lib/metadata/lv.c +++ b/lib/metadata/lv.c @@ -1140,9 +1140,9 @@ char *lv_attr_dup_with_info_and_seg_status(struct dm_pool *mem, const struct lv_ else if (lv_is_cache_type(lv)) repstr[0] = 'C'; else if (lv_is_raid(lv)) - repstr[0] = (lv->status & LV_NOTSYNCED) ? 'R' : 'r'; + repstr[0] = (lv_is_not_synced(lv)) ? 'R' : 'r'; else if (lv_is_mirror(lv)) - repstr[0] = (lv->status & LV_NOTSYNCED) ? 'M' : 'm'; + repstr[0] = (lv_is_not_synced(lv)) ? 'M' : 'm'; else if (lv_is_thin_volume(lv)) repstr[0] = lv_is_merging_origin(lv) ? 'O' : (lv_is_merging_thin_snapshot(lv) ? 'S' : 'V'); diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index a47bd1636..c6b8eb536 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -4027,7 +4027,7 @@ int lv_extend(struct logical_volume *lv, */ if (old_extents && segtype_is_mirrored(segtype) && - (lv->status & LV_NOTSYNCED)) { + (lv_is_not_synced(lv))) { dm_percent_t sync_percent = DM_PERCENT_INVALID; if (!lv_is_active_locally(lv)) { diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h index 84b510b59..37d4bf837 100644 --- a/lib/metadata/metadata-exported.h +++ b/lib/metadata/metadata-exported.h @@ -218,6 +218,7 @@ #define lv_is_mirror_log(lv) (((lv)->status & MIRROR_LOG) ? 1 : 0) #define lv_is_mirror(lv) (((lv)->status & MIRROR) ? 1 : 0) #define lv_is_mirror_type(lv) (((lv)->status & (MIRROR | MIRROR_LOG | MIRROR_IMAGE)) ? 1 : 0) +#define lv_is_not_synced(lv) (((lv)->status & LV_NOTSYNCED) ? 1 : 0) #define lv_is_pending_delete(lv) (((lv)->status & LV_PENDING_DELETE) ? 1 : 0) #define lv_is_error_when_full(lv) (((lv)->status & LV_ERROR_WHEN_FULL) ? 1 : 0) diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c index 2ef47b2c6..feb8d6e59 100644 --- a/lib/metadata/raid_manip.c +++ b/lib/metadata/raid_manip.c @@ -590,7 +590,7 @@ static int _raid_add_images(struct logical_volume *lv, struct lv_list *lvl; struct lv_segment_area *new_areas; - if (lv->status & LV_NOTSYNCED) { + if (lv_is_not_synced(lv)) { log_error("Can't add image to out-of-sync RAID LV:" " use 'lvchange --resync' first."); return 0; diff --git a/lib/report/report.c b/lib/report/report.c index 512986e2e..fab6379cd 100644 --- a/lib/report/report.c +++ b/lib/report/report.c @@ -3161,7 +3161,7 @@ static int _lvinitialimagesync_disp(struct dm_report *rh, struct dm_pool *mem, int initial_image_sync; if (lv_is_raid(lv) || lv_is_mirrored(lv)) - initial_image_sync = (lv->status & LV_NOTSYNCED) == 0; + initial_image_sync = !lv_is_not_synced(lv); else initial_image_sync = 0; diff --git a/tools/lvchange.c b/tools/lvchange.c index 4b02ba951..9194cd600 100644 --- a/tools/lvchange.c +++ b/tools/lvchange.c @@ -404,7 +404,7 @@ static int _lvchange_resync(struct cmd_context *cmd, struct logical_volume *lv) * worry about persistent logs. */ if (!seg_is_raid(seg) && !seg->log_lv) { - if (lv->status & LV_NOTSYNCED) { + if (lv_is_not_synced(lv)) { lv->status &= ~LV_NOTSYNCED; log_very_verbose("Updating logical volume %s on disk(s).", display_lvname(lv)); diff --git a/tools/lvconvert.c b/tools/lvconvert.c index b8c1959da..0368e8412 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -1418,7 +1418,7 @@ static int _lvconvert_mirrors_aux(struct cmd_context *cmd, * Up-convert m-way mirror to n-way mirror */ if (new_mimage_count > old_mimage_count) { - if (lv->status & LV_NOTSYNCED) { + if (lv_is_not_synced(lv)) { log_error("Can't add mirror to out-of-sync mirrored " "LV: use lvchange --resync first."); return 0; -- 2.43.5