shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

validation: share more code for pool validation

Browse Source 
Reuse thin validation code for cache pool validation.
This commit is contained in:
Zdenek Kabelac 2014-10-03 18:48:42 +02:00
parent 57a52e7878
commit 6c44299006
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/metadata/merge.c
View File

@ -110,7 +110,7 @@ int check_lv_segments(struct logical_volume *lv, int complete_vg)
}
}
if (lv_is_thin_pool_data(lv) &&
if (lv_is_pool_data(lv) &&
(!(seg2 = first_seg(lv)) || !(seg2 = find_pool_seg(seg2)) ||
seg2->area_count != 1 || seg_type(seg2, 0) != AREA_LV ||
seg_lv(seg2, 0) != lv)) {
@ -119,7 +119,7 @@ int check_lv_segments(struct logical_volume *lv, int complete_vg)
inc_error_count;
}
if (lv_is_thin_pool_metadata(lv) &&
if (lv_is_pool_metadata(lv) &&
(!(seg2 = first_seg(lv)) || !(seg2 = find_pool_seg(seg2)) ||
seg2->metadata_lv != lv)) {
log_error("LV %s: segment 1 pool metadata LV does not point back to same LV",
@ -236,7 +236,7 @@ int check_lv_segments(struct logical_volume *lv, int complete_vg)
}
} else {
if (seg->metadata_lv) {
log_error("LV %s: segment %u must not have thin pool metadata LV set",
log_error("LV %s: segment %u must not have pool metadata LV set",
lv->name, seg_count);
inc_error_count;
}
@ -301,7 +301,7 @@ int check_lv_segments(struct logical_volume *lv, int complete_vg)
}
} else {
if (seg->pool_lv) {
log_error("LV %s: segment %u must not have thin pool LV set",
log_error("LV %s: segment %u must not have pool LV set",
lv->name, seg_count);
inc_error_count;
}

1
lib/metadata/metadata-exported.h
View File

@ -199,6 +199,7 @@
#define lv_is_cache_type(lv) (((lv)->status & (CACHE | CACHE_POOL | CACHE_POOL_DATA | CACHE_POOL_METADATA)) ? 1 : 0)
#define lv_is_pool(lv) (((lv)->status & (CACHE_POOL | THIN_POOL)) ? 1 : 0)
#define lv_is_pool_data(lv) (((lv)->status & (CACHE_POOL_DATA | THIN_POOL_DATA)) ? 1 : 0)
#define lv_is_pool_metadata(lv) (((lv)->status & (CACHE_POOL_METADATA | THIN_POOL_METADATA)) ? 1 : 0)
#define lv_is_pool_metadata_spare(lv) (((lv)->status & POOL_METADATA_SPARE) ? 1 : 0)