diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2016-12-22 21:15:31 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2016-12-22 23:37:07 +0100 |
| commit | 95e3dd5fb1297f6b1aa23cbedad1ab3dc14343a7 (patch) | |
| tree | 3218564b05adfb9ece1e939bb3df07551b991e92 | |
| parent | 9491ab41cd61501039027fa5d7cfe89f78504132 (diff) | |
| download | lvm2-95e3dd5fb1297f6b1aa23cbedad1ab3dc14343a7.tar.gz | |
lv: more exact check for merging origin
Merging origin has 'MERGE_LV' and should also have its merging snapshot.
| -rw-r--r-- | WHATS_NEW | 1 | ||||
| -rw-r--r-- | lib/metadata/metadata-exported.h | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -1,5 +1,6 @@ Version 2.02.169 - ===================================== + Checking LV for merging origin requires also it has merged snapshot. Extend validation of metadata processing. Enable usage of cached volumes as snapshot origin LV. Fix displayed lv name when splitting snapshot (2.02.146). diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h index aa40c6c1e..4e0588538 100644 --- a/lib/metadata/metadata-exported.h +++ b/lib/metadata/metadata-exported.h @@ -198,7 +198,7 @@ #define lv_is_partial(lv) (((lv)->status & PARTIAL_LV) ? 1 : 0) #define lv_is_virtual(lv) (((lv)->status & VIRTUAL) ? 1 : 0) #define lv_is_merging(lv) (((lv)->status & MERGING) ? 1 : 0) -#define lv_is_merging_origin(lv) (lv_is_merging(lv)) +#define lv_is_merging_origin(lv) (lv_is_merging(lv) && (lv)->snapshot) #define lv_is_snapshot(lv) (((lv)->status & SNAPSHOT) ? 1 : 0) #define lv_is_converting(lv) (((lv)->status & CONVERTING) ? 1 : 0) #define lv_is_external_origin(lv) (((lv)->external_count > 0) ? 1 : 0) |