lvm2-commits October 2014

lvm2-commits@lists.fedorahosted.org

5 participants
169 discussions

master - tools: refactor reporter code
by Zdenek Kabelac 24 Oct '14

24 Oct '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=5bdf48b489660d1e… Commit: 5bdf48b489660d1e99631fcb950c2094a9d158c2 Parent: 482e572e5de327ce3b8786215cf33e6d6223c543 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Oct 22 14:30:33 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Oct 24 16:39:31 2014 +0200 tools: refactor reporter code Use new libdm macro DM_LIST_HEAD_INIT(). Embeded 'free' segment type (so it's not needed in the list) Drop assignments of 0,NULL since they are defaults. --- lib/report/report.c | 10 +++++----- tools/reporter.c | 46 ++++++++++++++++++---------------------------- 2 files changed, 23 insertions(+), 33 deletions(-) diff --git a/lib/report/report.c b/lib/report/report.c index 445f603..ebf3b3f 100644 --- a/lib/report/report.c +++ b/lib/report/report.c @@ -1696,17 +1696,17 @@ static int _lvskipactivation_disp(struct dm_report *rh, struct dm_pool *mem, /* necessary for displaying something for PVs not belonging to VG */ static struct format_instance _dummy_fid = { - .metadata_areas_in_use = { &(_dummy_fid.metadata_areas_in_use), &(_dummy_fid.metadata_areas_in_use) }, - .metadata_areas_ignored = { &(_dummy_fid.metadata_areas_ignored), &(_dummy_fid.metadata_areas_ignored) }, + .metadata_areas_in_use = DM_LIST_HEAD_INIT(_dummy_fid.metadata_areas_in_use), + .metadata_areas_ignored = DM_LIST_HEAD_INIT(_dummy_fid.metadata_areas_ignored), }; static struct volume_group _dummy_vg = { .fid = &_dummy_fid, .name = "", .system_id = (char *) "", - .pvs = { &(_dummy_vg.pvs), &(_dummy_vg.pvs) }, - .lvs = { &(_dummy_vg.lvs), &(_dummy_vg.lvs) }, - .tags = { &(_dummy_vg.tags), &(_dummy_vg.tags) }, + .pvs = DM_LIST_HEAD_INIT(_dummy_vg.pvs), + .lvs = DM_LIST_HEAD_INIT(_dummy_vg.lvs), + .tags = DM_LIST_HEAD_INIT(_dummy_vg.tags), }; static void *_obj_get_vg(void *obj) diff --git a/tools/reporter.c b/tools/reporter.c index c55d653..9688151 100644 --- a/tools/reporter.c +++ b/tools/reporter.c @@ -97,52 +97,42 @@ static int _do_pvsegs_sub_single(struct cmd_context *cmd, { int ret = ECMD_PROCESSED; struct lv_segment *seg = pvseg->lvseg; - struct lvinfo lvinfo; + struct lvinfo lvinfo = { .exists = 0 }; + + struct segment_type _freeseg_type = { + .cmd = cmd, + .name = "free", + .flags = SEG_VIRTUAL | SEG_CANNOT_BE_ZEROED, + }; struct volume_group _free_vg = { .cmd = cmd, .name = "", - .vgmem = NULL, + .pvs = DM_LIST_HEAD_INIT(_free_vg.pvs), + .lvs = DM_LIST_HEAD_INIT(_free_vg.lvs), + .tags = DM_LIST_HEAD_INIT(_free_vg.tags), }; struct logical_volume _free_logical_volume = { .vg = vg ?: &_free_vg, .name = "", - .snapshot = NULL, .status = VISIBLE_LV, .major = -1, .minor = -1, + .tags = DM_LIST_HEAD_INIT(_free_logical_volume.tags), + .segments = DM_LIST_HEAD_INIT(_free_logical_volume.segments), + .segs_using_this_lv = DM_LIST_HEAD_INIT(_free_logical_volume.segs_using_this_lv), + .snapshot_segs = DM_LIST_HEAD_INIT(_free_logical_volume.snapshot_segs), }; struct lv_segment _free_lv_segment = { .lv = &_free_logical_volume, - .le = 0, - .status = 0, - .stripe_size = 0, - .area_count = 0, - .area_len = 0, - .origin = NULL, - .cow = NULL, - .chunk_size = 0, - .region_size = 0, - .extents_copied = 0, - .log_lv = NULL, - .areas = NULL, + .segtype = &_freeseg_type, + .len = pvseg->len, + .tags = DM_LIST_HEAD_INIT(_free_lv_segment.tags), + .origin_list = DM_LIST_HEAD_INIT(_free_lv_segment.origin_list), }; - _free_lv_segment.segtype = get_segtype_from_string(cmd, "free"); - _free_lv_segment.len = pvseg->len; - dm_list_init(&_free_vg.pvs); - dm_list_init(&_free_vg.lvs); - dm_list_init(&_free_vg.tags); - dm_list_init(&_free_lv_segment.tags); - dm_list_init(&_free_lv_segment.origin_list); - dm_list_init(&_free_logical_volume.tags); - dm_list_init(&_free_logical_volume.segments); - dm_list_init(&_free_logical_volume.segs_using_this_lv); - dm_list_init(&_free_logical_volume.snapshot_segs); - - lvinfo.exists = 0; if (seg && lv_info_needed) _get_lv_info_for_report(cmd, seg->lv, &lvinfo);

1 0

master - libdm: add DM_LIST_HEAD_INIT macro
by Zdenek Kabelac 24 Oct '14

24 Oct '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=482e572e5de327ce… Commit: 482e572e5de327ce3b8786215cf33e6d6223c543 Parent: a98ea95c4da5afffbacd32c519734e7daef98ea9 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Oct 22 14:30:19 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Oct 24 16:39:31 2014 +0200 libdm: add DM_LIST_HEAD_INIT macro Support to initialize dm_list struct members. --- WHATS_NEW_DM | 1 + libdm/libdevmapper.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index d60b35f..5ab34c1 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,6 @@ Version 1.02.91 - ==================================== + Add DM_LIST_HEAD_INIT macro to libdevmapper.h Fix dm_is_dm_major to not issue error about missing /proc lines for dm module. Version 1.02.90 - 1st September 2014 diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h index 31574af..76c4eee 100644 --- a/libdm/libdevmapper.h +++ b/libdm/libdevmapper.h @@ -1200,7 +1200,8 @@ struct dm_str_list { * Initialise a list before use. * The list head's next and previous pointers point back to itself. */ -#define DM_LIST_INIT(name) struct dm_list name = { &(name), &(name) } +#define DM_LIST_HEAD_INIT(name) { &(name), &(name) } +#define DM_LIST_INIT(name) struct dm_list name = DM_LIST_HEAD_INIT(name) void dm_list_init(struct dm_list *head); /*

1 0

master - pool: better error message
by Zdenek Kabelac 24 Oct '14

24 Oct '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=a98ea95c4da5afff… Commit: a98ea95c4da5afffbacd32c519734e7daef98ea9 Parent: a2244c37764f8481fedd7d4b5f286665e9d46af2 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Oct 20 15:02:59 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Oct 24 16:39:31 2014 +0200 pool: better error message --- lib/metadata/pool_manip.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/metadata/pool_manip.c b/lib/metadata/pool_manip.c index 011d9c0..2fbadea 100644 --- a/lib/metadata/pool_manip.c +++ b/lib/metadata/pool_manip.c @@ -371,8 +371,8 @@ int update_pool_params(const struct segment_type *segtype, return_0; if ((uint64_t) *chunk_size > (uint64_t) data_extents * vg->extent_size) { - log_error("Chunk size %s is bigger then pool data size.", - display_size(vg->cmd, *chunk_size)); + log_error("Size of %s data volume cannot be smaller then chunk size %s.", + segtype->name, display_size(vg->cmd, *chunk_size)); return 0; } @@ -569,6 +569,7 @@ static struct logical_volume *_alloc_pool_metadata_spare(struct volume_group *vg return_0; /* FIXME: Maybe using silent mode ? */ + log_verbose("Preparing pool metadata spare volume for Volume group %s.", vg->name); if (!(lv = lv_create_single(vg, &lp))) return_0; @@ -656,6 +657,7 @@ int vg_set_pool_metadata_spare(struct logical_volume *lv) return 0; } + log_verbose("Renaming %s as pool metadata spare volume %s.", lv->name, new_name); if (!lv_rename_update(vg->cmd, lv, new_name, 0)) return_0;

1 0

master - pool: fix testmode support with pools
by Zdenek Kabelac 24 Oct '14

24 Oct '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=a2244c37764f8481… Commit: a2244c37764f8481fedd7d4b5f286665e9d46af2 Parent: 1c7aae40a1bb1351680ec8c7afa12c2bf8b784a0 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Oct 20 15:03:24 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Oct 24 16:39:31 2014 +0200 pool: fix testmode support with pools Allow the --test mode to proceed further. --- WHATS_NEW | 1 + lib/metadata/pool_manip.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 3b52595..b197568 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.112 - ===================================== + Better support for --test mode with pool creation. Query lock holding LV when replacing and converting raid volumes. Add extra validate for locked lv within validate_lv_cache_create(). Add internal lvseg_name() function. diff --git a/lib/metadata/pool_manip.c b/lib/metadata/pool_manip.c index 4c0ab72..011d9c0 100644 --- a/lib/metadata/pool_manip.c +++ b/lib/metadata/pool_manip.c @@ -415,7 +415,7 @@ int create_pool(struct logical_volume *pool_lv, if (!activation()) log_warn("WARNING: Pool %s is created without initialization.", pool_lv->name); - else { + else if (!test_mode()) { if (!vg_write(pool_lv->vg) || !vg_commit(pool_lv->vg)) return_0;

1 0

master - raid: query lock holder
by Zdenek Kabelac 24 Oct '14

24 Oct '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=1c7aae40a1bb1351… Commit: 1c7aae40a1bb1351680ec8c7afa12c2bf8b784a0 Parent: e901a87a69bf8573e441790ebca2ca9376aaf8a6 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Oct 21 10:53:56 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Oct 24 16:39:31 2014 +0200 raid: query lock holder Ask for lock the proper LV. Use the top-most LV to query for locally exclusive lock. The rest of operations are then using 'lv_info()' TODO: Check all devices are reloaded from proper level. In general any query on lv_is_active is supposed to be running ona lv_lock_holder() volume. --- WHATS_NEW | 1 + lib/metadata/raid_manip.c | 2 +- tools/lvconvert.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 8b9cf6f..3b52595 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.112 - ===================================== + Query lock holding LV when replacing and converting raid volumes. Add extra validate for locked lv within validate_lv_cache_create(). Add internal lvseg_name() function. Skip trying to file lock virtual internal vg name. diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c index 8219984..5237dc9 100644 --- a/lib/metadata/raid_manip.c +++ b/lib/metadata/raid_manip.c @@ -1555,7 +1555,7 @@ int lv_raid_replace(struct logical_volume *lv, if (lv->status & PARTIAL_LV) lv->vg->cmd->partial_activation = 1; - if (!lv_is_active_exclusive_locally(lv)) { + if (!lv_is_active_exclusive_locally(lv_lock_holder(lv))) { log_error("%s/%s must be active %sto perform this operation.", lv->vg->name, lv->name, vg_is_clustered(lv->vg) ? "exclusive locally " : ""); diff --git a/tools/lvconvert.c b/tools/lvconvert.c index e976880..fc28846 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -1902,7 +1902,7 @@ static int _lvconvert_raid(struct logical_volume *lv, struct lvconvert_params *l return lv_raid_replace(lv, lp->replace_pvh, lp->pvh); if (arg_count(cmd, repair_ARG)) { - if (!lv_is_active_exclusive_locally(lv)) { + if (!lv_is_active_exclusive_locally(lv_lock_holder(lv))) { log_error("%s/%s must be active %sto perform this" " operation.", lv->vg->name, lv->name, vg_is_clustered(lv->vg) ?

1 0

master - cache: better error message
by Zdenek Kabelac 24 Oct '14

24 Oct '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=e901a87a69bf8573… Commit: e901a87a69bf8573e441790ebca2ca9376aaf8a6 Parent: 6e57dbfcaa3fdc2aabe7c05f95268a35d6b198ca Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Oct 20 14:53:48 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Oct 24 16:39:31 2014 +0200 cache: better error message --- lib/metadata/cache_manip.c | 4 ++-- tools/lvcreate.c | 21 ++++++++++----------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/lib/metadata/cache_manip.c b/lib/metadata/cache_manip.c index 837c651..6aad50d 100644 --- a/lib/metadata/cache_manip.c +++ b/lib/metadata/cache_manip.c @@ -148,8 +148,8 @@ int validate_lv_cache_create(const struct logical_volume *pool_lv, lv_is_cow(origin_lv) || lv_is_merging_cow(origin_lv) || lv_is_external_origin(origin_lv) || lv_is_virtual(origin_lv)) { - log_error("Cache is not supported with origin LV %s type.", - display_lvname(origin_lv)); + log_error("Cache is not supported with %s segment type of the original logical volume %s.", + first_seg(origin_lv)->segtype->name, display_lvname(origin_lv)); return 0; } diff --git a/tools/lvcreate.c b/tools/lvcreate.c index 5a4bced..d849f93 100644 --- a/tools/lvcreate.c +++ b/tools/lvcreate.c @@ -61,21 +61,21 @@ static int _lvcreate_name_params(struct lvcreate_params *lp, if (seg_is_cache(lp)) { /* - * We allowed somewhat hard to 'parse' syntax - * (usage of lvcreate to convert LV to a cached LV). - * So let's try to do our best to avoid wrong steps. + * 2 ways of cache usage for lvcreate -H -l1 vg/lv + * + * vg/lv is existing cache pool: + * cached LV is created using this cache pool + * vg/lv is not cache pool so it is cache origin + * origin is cached with created cache pool * * We are looking for the vgname or cache pool or cache origin LV. * - * We store the lv name in 'lp->pool', but - * it must be accessed later (when we can look-up the - * LV in the VG) whether it is truly the cache pool - * or whether it is the origin for cached LV. + * lv name is stored in origin_name and pool_name and + * later with opened VG it's decided what should happen. */ if (!argc) { if (!lp->pool_name) { - /* Don't advertise we could handle cache origin */ - log_error("Please specify a logical volume to act as the cache pool."); + log_error("Please specify a logical volume to act as the cache pool or origin."); return 0; } } else { @@ -85,7 +85,7 @@ static int _lvcreate_name_params(struct lvcreate_params *lp, if (!_set_vg_name(lp, vg_name)) return_0; } else { - /* Lets pretend it's cache origin for now */ + /* Assume it's cache origin for now */ lp->origin_name = vg_name; if (!validate_lvname_param(cmd, &lp->vg_name, &lp->origin_name)) return_0; @@ -94,7 +94,6 @@ static int _lvcreate_name_params(struct lvcreate_params *lp, if (strcmp(lp->pool_name, lp->origin_name)) { log_error("Unsupported syntax, cannot use cache origin %s and --cachepool %s.", lp->origin_name, lp->pool_name); - /* Stop here, only older form remains supported */ return 0; } lp->origin_name = NULL;

1 0

master - cache: validate for locked
by Zdenek Kabelac 24 Oct '14

24 Oct '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=6e57dbfcaa3fdc2a… Commit: 6e57dbfcaa3fdc2aabe7c05f95268a35d6b198ca Parent: d4dab0aa34102527c32d68f69196aaabda5e3711 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Oct 20 14:58:29 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Oct 24 16:39:31 2014 +0200 cache: validate for locked Add extra safety. --- WHATS_NEW | 1 + lib/metadata/cache_manip.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index f5b7931..8b9cf6f 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.112 - ===================================== + Add extra validate for locked lv within validate_lv_cache_create(). Add internal lvseg_name() function. Skip trying to file lock virtual internal vg name. Fix selection on {vg,lv}_permissions fields to properly match selection criteria. diff --git a/lib/metadata/cache_manip.c b/lib/metadata/cache_manip.c index 0a6daf6..837c651 100644 --- a/lib/metadata/cache_manip.c +++ b/lib/metadata/cache_manip.c @@ -104,6 +104,12 @@ int validate_lv_cache_create(const struct logical_volume *pool_lv, return 0; } + if (lv_is_locked(pool_lv)) { + log_error("Cannot use locked cache pool %s.", + display_lvname(pool_lv)); + return 0; + } + if (origin_lv == pool_lv) { log_error("Can't use same LV %s for cache pool and cache volume.", display_lvname(pool_lv)); @@ -119,6 +125,12 @@ int validate_lv_cache_create(const struct logical_volume *pool_lv, } } + if (lv_is_locked(origin_lv)) { + log_error("Cannot use locked origin volume %s.", + display_lvname(origin_lv)); + return 0; + } + /* For now we only support conversion of thin pool data volume */ if (!lv_is_visible(origin_lv) && !lv_is_thin_pool_data(origin_lv)) { log_error("Can't convert internal LV %s.", display_lvname(origin_lv));

1 0

master - cleanup: drop default implementation
by Zdenek Kabelac 24 Oct '14

24 Oct '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=d4dab0aa34102527… Commit: d4dab0aa34102527c32d68f69196aaabda5e3711 Parent: 9411c19b31b391e7be262d95fb2fa5a5162012b2 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Oct 20 20:09:42 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Oct 24 16:39:31 2014 +0200 cleanup: drop default implementation Now we reference segment name via lvseg_name() and we can drop default implementation and leave its function pointer to be NULL. Default give us 'return seg->segtype->name'. --- lib/cache_segtype/cache.c | 7 ------- lib/error/errseg.c | 6 ------ lib/freeseg/freeseg.c | 6 ------ lib/mirror/mirrored.c | 6 ------ lib/raid/raid.c | 8 +------- lib/replicator/replicator.c | 6 ------ lib/snapshot/snapshot.c | 8 +------- lib/thin/thin.c | 12 ------------ lib/unknown/unknown.c | 7 ------- lib/zero/zero.c | 6 ------ 10 files changed, 2 insertions(+), 70 deletions(-) diff --git a/lib/cache_segtype/cache.c b/lib/cache_segtype/cache.c index ddaf3cf..9927688 100644 --- a/lib/cache_segtype/cache.c +++ b/lib/cache_segtype/cache.c @@ -31,11 +31,6 @@ dm_config_parent_name(sn), seg->lv->name), 0; -static const char *_name(const struct lv_segment *seg) -{ - return seg->segtype->name; -} - static int _cache_pool_text_import(struct lv_segment *seg, const struct dm_config_node *sn, struct dm_hash_table *pv_hash __attribute__((unused))) @@ -262,7 +257,6 @@ static int _modules_needed(struct dm_pool *mem, #endif /* DEVMAPPER_SUPPORT */ static struct segtype_handler _cache_pool_ops = { - .name = _name, .text_import = _cache_pool_text_import, .text_import_area_count = _cache_pool_text_import_area_count, .text_export = _cache_pool_text_export, @@ -365,7 +359,6 @@ static int _cache_add_target_line(struct dev_manager *dm, #endif /* DEVMAPPER_SUPPORT */ static struct segtype_handler _cache_ops = { - .name = _name, .text_import = _cache_text_import, .text_import_area_count = _cache_text_import_area_count, .text_export = _cache_text_export, diff --git a/lib/error/errseg.c b/lib/error/errseg.c index f3bf9c9..af19e7d 100644 --- a/lib/error/errseg.c +++ b/lib/error/errseg.c @@ -21,11 +21,6 @@ #include "activate.h" #include "str_list.h" -static const char *_errseg_name(const struct lv_segment *seg) -{ - return seg->segtype->name; -} - static int _errseg_merge_segments(struct lv_segment *seg1, struct lv_segment *seg2) { seg1->len += seg2->len; @@ -83,7 +78,6 @@ static void _errseg_destroy(struct segment_type *segtype) } static struct segtype_handler _error_ops = { - .name = _errseg_name, .merge_segments = _errseg_merge_segments, #ifdef DEVMAPPER_SUPPORT .add_target_line = _errseg_add_target_line, diff --git a/lib/freeseg/freeseg.c b/lib/freeseg/freeseg.c index 1dce243..b4eba94 100644 --- a/lib/freeseg/freeseg.c +++ b/lib/freeseg/freeseg.c @@ -16,18 +16,12 @@ #include "toolcontext.h" #include "segtype.h" -static const char *_freeseg_name(const struct lv_segment *seg) -{ - return seg->segtype->name; -} - static void _freeseg_destroy(struct segment_type *segtype) { dm_free(segtype); } static struct segtype_handler _freeseg_ops = { - .name = _freeseg_name, .destroy = _freeseg_destroy, }; diff --git a/lib/mirror/mirrored.c b/lib/mirror/mirrored.c index 411b4d4..46dfe02 100644 --- a/lib/mirror/mirrored.c +++ b/lib/mirror/mirrored.c @@ -38,11 +38,6 @@ struct mirror_state { uint32_t default_region_size; }; -static const char *_mirrored_name(const struct lv_segment *seg) -{ - return seg->segtype->name; -} - static void _mirrored_display(const struct lv_segment *seg) { const char *size; @@ -592,7 +587,6 @@ static void _mirrored_destroy(struct segment_type *segtype) } static struct segtype_handler _mirrored_ops = { - .name = _mirrored_name, .display = _mirrored_display, .text_import_area_count = _mirrored_text_import_area_count, .text_import = _mirrored_text_import, diff --git a/lib/raid/raid.c b/lib/raid/raid.c index 6628dc8..7cc4301 100644 --- a/lib/raid/raid.c +++ b/lib/raid/raid.c @@ -25,11 +25,6 @@ #include "metadata.h" #include "lv_alloc.h" -static const char *_raid_name(const struct lv_segment *seg) -{ - return seg->segtype->name; -} - static void _raid_display(const struct lv_segment *seg) { unsigned s; @@ -243,7 +238,7 @@ static int _raid_add_target_line(struct dev_manager *dm __attribute__((unused)), if (mirror_in_sync()) flags = DM_NOSYNC; - params.raid_type = _raid_name(seg); + params.raid_type = lvseg_name(seg); if (seg->segtype->parity_devs) { /* RAID 4/5/6 */ params.mirrors = 1; @@ -418,7 +413,6 @@ static int _raid_target_unmonitor_events(struct lv_segment *seg, int events) #endif /* DEVMAPPER_SUPPORT */ static struct segtype_handler _raid_ops = { - .name = _raid_name, .display = _raid_display, .text_import_area_count = _raid_text_import_area_count, .text_import = _raid_text_import, diff --git a/lib/replicator/replicator.c b/lib/replicator/replicator.c index 2e3632a..ae87d7f 100644 --- a/lib/replicator/replicator.c +++ b/lib/replicator/replicator.c @@ -39,10 +39,6 @@ /* * Replicator target */ -static const char *_replicator_name(const struct lv_segment *seg) -{ - return seg->segtype->name; -} /* FIXME: missing implementation */ static void _replicator_display(const struct lv_segment *seg) @@ -410,7 +406,6 @@ static void _replicator_destroy(struct segment_type *segtype) } static struct segtype_handler _replicator_ops = { - .name = _replicator_name, .display = _replicator_display, .text_import = _replicator_text_import, .text_export = _replicator_text_export, @@ -739,7 +734,6 @@ static int _replicator_dev_target_present(struct cmd_context *cmd, #endif static struct segtype_handler _replicator_dev_ops = { - .name = _replicator_name, .display = _replicator_dev_display, .text_import = _replicator_dev_text_import, .text_export = _replicator_dev_text_export, diff --git a/lib/snapshot/snapshot.c b/lib/snapshot/snapshot.c index 0557f45..18e8111 100644 --- a/lib/snapshot/snapshot.c +++ b/lib/snapshot/snapshot.c @@ -25,18 +25,13 @@ log_error(t " segment %s of logical volume %s.", ## p, \ dm_config_parent_name(sn), seg->lv->name), 0; -static const char *_snap_name(const struct lv_segment *seg) -{ - return seg->segtype->name; -} - static const char *_snap_target_name(const struct lv_segment *seg, const struct lv_activate_opts *laopts) { if (!laopts->no_merging && (seg->status & MERGING)) return "snapshot-merge"; - return _snap_name(seg); + return lvseg_name(seg); } static int _snap_text_import(struct lv_segment *seg, const struct dm_config_node *sn, @@ -234,7 +229,6 @@ static void _snap_destroy(struct segment_type *segtype) } static struct segtype_handler _snapshot_ops = { - .name = _snap_name, .target_name = _snap_target_name, .text_import = _snap_text_import, .text_export = _snap_text_export, diff --git a/lib/thin/thin.c b/lib/thin/thin.c index 6982782..9ae237e 100644 --- a/lib/thin/thin.c +++ b/lib/thin/thin.c @@ -36,11 +36,6 @@ static const char _thin_module[] = "thin"; /* TODO: using static field here, maybe should be a part of segment_type */ static unsigned _feature_mask; -static const char *_thin_pool_name(const struct lv_segment *seg) -{ - return seg->segtype->name; -} - static void _thin_pool_display(const struct lv_segment *seg) { log_print(" Chunk size\t\t%s", @@ -449,11 +444,6 @@ static int _target_unregister_events(struct lv_segment *seg, # endif /* DMEVENTD */ #endif /* DEVMAPPER_SUPPORT */ -static const char *_thin_name(const struct lv_segment *seg) -{ - return seg->segtype->name; -} - static void _thin_display(const struct lv_segment *seg) { log_print(" Device ID\t\t%u", seg->device_id); @@ -720,7 +710,6 @@ static void _thin_destroy(struct segment_type *segtype) } static struct segtype_handler _thin_pool_ops = { - .name = _thin_pool_name, .display = _thin_pool_display, .text_import = _thin_pool_text_import, .text_import_area_count = _thin_pool_text_import_area_count, @@ -740,7 +729,6 @@ static struct segtype_handler _thin_pool_ops = { }; static struct segtype_handler _thin_ops = { - .name = _thin_name, .display = _thin_display, .text_import = _thin_text_import, .text_export = _thin_text_export, diff --git a/lib/unknown/unknown.c b/lib/unknown/unknown.c index 2ce2f9d..760f1c2 100644 --- a/lib/unknown/unknown.c +++ b/lib/unknown/unknown.c @@ -18,12 +18,6 @@ #include "text_export.h" #include "config.h" -static const char *_unknown_name(const struct lv_segment *seg) -{ - - return seg->segtype->name; -} - static int _unknown_text_import(struct lv_segment *seg, const struct dm_config_node *sn, struct dm_hash_table *pv_hash) { @@ -59,7 +53,6 @@ static void _unknown_destroy(struct segment_type *segtype) } static struct segtype_handler _unknown_ops = { - .name = _unknown_name, .text_import = _unknown_text_import, .text_export = _unknown_text_export, .destroy = _unknown_destroy, diff --git a/lib/zero/zero.c b/lib/zero/zero.c index 2a1fd0b..9f9d06c 100644 --- a/lib/zero/zero.c +++ b/lib/zero/zero.c @@ -19,11 +19,6 @@ #include "str_list.h" #include "activate.h" -static const char *_zero_name(const struct lv_segment *seg) -{ - return seg->segtype->name; -} - static int _zero_merge_segments(struct lv_segment *seg1, struct lv_segment *seg2) { seg1->len += seg2->len; @@ -79,7 +74,6 @@ static void _zero_destroy(struct segment_type *segtype) } static struct segtype_handler _zero_ops = { - .name = _zero_name, .merge_segments = _zero_merge_segments, #ifdef DEVMAPPER_SUPPORT .add_target_line = _zero_add_target_line,

1 0

master - segments: introduce lvseg_name
by Zdenek Kabelac 24 Oct '14

24 Oct '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=9411c19b31b391e7… Commit: 9411c19b31b391e7be262d95fb2fa5a5162012b2 Parent: ab940456931ea5a5a6f29f63d1b27057df3fdf75 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Oct 20 18:40:39 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Oct 24 16:39:30 2014 +0200 segments: introduce lvseg_name Instead of segtype->ops->name() introduce lvseg_name(). This also allows us to leave name() function 'empty' for default return of segtype->name. TODO: add functions for rest of ops-> --- WHATS_NEW | 1 + lib/display/display.c | 2 +- lib/metadata/lv.c | 12 +++++++++++- lib/metadata/lv.h | 1 + lib/metadata/lv_manip.c | 2 +- lib/metadata/merge.c | 3 +-- lib/metadata/pool_manip.c | 6 +++--- lib/metadata/raid_manip.c | 14 +++++++------- lib/report/report.c | 2 +- tools/lvchange.c | 2 +- tools/lvconvert.c | 9 ++++----- 11 files changed, 32 insertions(+), 22 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 4d2a6d2..f5b7931 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.112 - ===================================== + Add internal lvseg_name() function. Skip trying to file lock virtual internal vg name. Fix selection on {vg,lv}_permissions fields to properly match selection criteria. Fix lv_permissions reporting to display read-only{-override} instead of blank. diff --git a/lib/display/display.c b/lib/display/display.c index d12c393..f86b67f 100644 --- a/lib/display/display.c +++ b/lib/display/display.c @@ -667,7 +667,7 @@ int lvdisplay_segments(const struct logical_volume *lv) lv_is_virtual(lv) ? "Virtual" : "Logical", seg->le, seg->le + seg->len - 1); - log_print(" Type\t\t%s", seg->segtype->ops->name(seg)); + log_print(" Type\t\t%s", lvseg_name(seg)); if (seg->segtype->ops->target_monitored) log_print(" Monitoring\t\t%s", diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c index 23f0991..92b38f4 100644 --- a/lib/metadata/lv.c +++ b/lib/metadata/lv.c @@ -120,7 +120,7 @@ char *lvseg_tags_dup(const struct lv_segment *seg) char *lvseg_segtype_dup(struct dm_pool *mem, const struct lv_segment *seg) { - return dm_pool_strdup(mem, seg->segtype->ops->name(seg)); + return dm_pool_strdup(mem, lvseg_name(seg)); } char *lvseg_discards_dup(struct dm_pool *mem, const struct lv_segment *seg) @@ -183,6 +183,16 @@ uint64_t lvseg_chunksize(const struct lv_segment *seg) return size; } +const char *lvseg_name(const struct lv_segment *seg) +{ + /* Support even segtypes without 'ops' */ + if (seg->segtype->ops && + seg->segtype->ops->name) + return seg->segtype->ops->name(seg); + + return seg->segtype->name; +} + uint64_t lvseg_start(const struct lv_segment *seg) { return (uint64_t) seg->le * seg->lv->vg->extent_size; diff --git a/lib/metadata/lv.h b/lib/metadata/lv.h index bcd7028..2261913 100644 --- a/lib/metadata/lv.h +++ b/lib/metadata/lv.h @@ -77,6 +77,7 @@ struct logical_volume *lv_parent(const struct logical_volume *lv); char *lv_parent_dup(struct dm_pool *mem, const struct logical_volume *lv); char *lv_origin_dup(struct dm_pool *mem, const struct logical_volume *lv); uint32_t lv_kernel_read_ahead(const struct logical_volume *lv); +const char *lvseg_name(const struct lv_segment *seg); uint64_t lvseg_start(const struct lv_segment *seg); uint64_t lvseg_size(const struct lv_segment *seg); uint64_t lvseg_chunksize(const struct lv_segment *seg); diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index f14cec0..f60b964 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -4617,7 +4617,7 @@ static int _lvresize_adjust_extents(struct cmd_context *cmd, struct logical_volu else if (seg_is_raid(first_seg(lv)) && (lp->stripes != seg_stripes)) { log_error("Unable to extend \"%s\" segment type with different number of stripes.", - first_seg(lv)->segtype->ops->name(first_seg(lv))); + lvseg_name(first_seg(lv))); return 0; } diff --git a/lib/metadata/merge.c b/lib/metadata/merge.c index ad918f1..c8c9543 100644 --- a/lib/metadata/merge.c +++ b/lib/metadata/merge.c @@ -481,8 +481,7 @@ static int _lv_split_segment(struct logical_volume *lv, struct lv_segment *seg, if (!seg_can_split(seg)) { log_error("Unable to split the %s segment at LE %" PRIu32 - " in LV %s", seg->segtype->ops->name(seg), - le, lv->name); + " in LV %s", lvseg_name(seg), le, lv->name); return 0; } diff --git a/lib/metadata/pool_manip.c b/lib/metadata/pool_manip.c index 439b8ed..4c0ab72 100644 --- a/lib/metadata/pool_manip.c +++ b/lib/metadata/pool_manip.c @@ -33,7 +33,7 @@ int attach_pool_metadata_lv(struct lv_segment *pool_seg, if (!seg_is_pool(pool_seg)) { log_error(INTERNAL_ERROR "Unable to attach pool metadata LV to %s segtype.", - pool_seg->segtype->ops->name(pool_seg)); + lvseg_name(pool_seg)); return 0; } pool_seg->metadata_lv = metadata_lv; @@ -70,7 +70,7 @@ int attach_pool_data_lv(struct lv_segment *pool_seg, if (!seg_is_pool(pool_seg)) { log_error(INTERNAL_ERROR "Unable to attach pool data LV to %s segtype.", - pool_seg->segtype->ops->name(pool_seg)); + lvseg_name(pool_seg)); return 0; } @@ -129,7 +129,7 @@ int detach_pool_lv(struct lv_segment *seg) if (!seg->pool_lv) { log_error(INTERNAL_ERROR "No pool associated with %s LV, %s.", - seg->segtype->ops->name(seg), seg->lv->name); + lvseg_name(seg), seg->lv->name); return 0; } diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c index 44272e8..8219984 100644 --- a/lib/metadata/raid_manip.c +++ b/lib/metadata/raid_manip.c @@ -117,7 +117,7 @@ static int _raid_remove_top_layer(struct logical_volume *lv, if (!seg_is_mirrored(seg)) { log_error(INTERNAL_ERROR "Unable to remove RAID layer from segment type %s", - seg->segtype->ops->name(seg)); + lvseg_name(seg)); return 0; } @@ -579,7 +579,7 @@ static int _raid_add_images(struct logical_volume *lv, dm_list_add(&meta_lvs, &lvl->list); } else if (!seg_is_raid(seg)) { log_error("Unable to add RAID images to %s of segment type %s", - lv->name, seg->segtype->ops->name(seg)); + lv->name, lvseg_name(seg)); return 0; } @@ -1075,7 +1075,7 @@ int lv_raid_split(struct logical_volume *lv, const char *split_name, if (!seg_is_mirrored(first_seg(lv)) || !strcmp(first_seg(lv)->segtype->name, SEG_TYPE_NAME_RAID10)) { log_error("Unable to split logical volume of segment type, %s", - first_seg(lv)->segtype->ops->name(first_seg(lv))); + lvseg_name(first_seg(lv))); return 0; } @@ -1445,7 +1445,7 @@ int lv_raid_reshape(struct logical_volume *lv, log_error("Converting the segment type for %s/%s from %s to %s" " is not yet supported.", lv->vg->name, lv->name, - seg->segtype->ops->name(seg), new_segtype->name); + lvseg_name(seg), new_segtype->name); return 0; } @@ -1601,7 +1601,7 @@ int lv_raid_replace(struct logical_volume *lv, (match_count > raid_seg->segtype->parity_devs)) { log_error("Unable to replace more than %u PVs from (%s) %s/%s", raid_seg->segtype->parity_devs, - raid_seg->segtype->ops->name(raid_seg), + lvseg_name(raid_seg), lv->vg->name, lv->name); return 0; } else if (!strcmp(raid_seg->segtype->name, SEG_TYPE_NAME_RAID10)) { @@ -1790,7 +1790,7 @@ int lv_raid_remove_missing(struct logical_volume *lv) return_0; log_debug("Attempting to remove missing devices from %s LV, %s", - seg->segtype->ops->name(seg), lv->name); + lvseg_name(seg), lv->name); /* * FIXME: Make sure # of compromised components will not affect RAID @@ -1870,7 +1870,7 @@ static int _partial_raid_lv_is_redundant(const struct logical_volume *lv) (failed_components > raid_seg->segtype->parity_devs)) { log_verbose("More than %u components from %s %s have failed.", raid_seg->segtype->parity_devs, - raid_seg->segtype->ops->name(raid_seg), + lvseg_name(raid_seg), display_lvname(lv)); return 0; /* Insufficient redundancy to activate */ } diff --git a/lib/report/report.c b/lib/report/report.c index e85c349..445f603 100644 --- a/lib/report/report.c +++ b/lib/report/report.c @@ -366,7 +366,7 @@ static int _segtype_disp(struct dm_report *rh __attribute__((unused)), char *name; if (!(name = lvseg_segtype_dup(mem, seg))) { - log_error("Failed to get segtype."); + log_error("Failed to get segtype name."); return 0; } diff --git a/tools/lvchange.c b/tools/lvchange.c index 114065c..6cb6f15 100644 --- a/tools/lvchange.c +++ b/tools/lvchange.c @@ -355,7 +355,7 @@ static int lvchange_resync(struct cmd_context *cmd, struct logical_volume *lv) vg_is_clustered(lv->vg) ? "clustered " : "", (seg->log_lv) ? "disk-logged " : seg_is_raid(seg) ? "" : "core-logged ", - seg->segtype->ops->name(seg), lv->name); + lvseg_name(seg), lv->name); /* * If this mirror has a core log (i.e. !seg->log_lv), diff --git a/tools/lvconvert.c b/tools/lvconvert.c index ad4a6c0..e976880 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -1850,7 +1850,7 @@ static int _lvconvert_raid(struct logical_volume *lv, struct lvconvert_params *l if (arg_count(cmd, mirrors_ARG) && !seg_is_mirrored(seg) && !seg_is_linear(seg)) { log_error("'--mirrors/-m' is not compatible with %s", - seg->segtype->ops->name(seg)); + lvseg_name(seg)); return 0; } @@ -1860,7 +1860,7 @@ static int _lvconvert_raid(struct logical_volume *lv, struct lvconvert_params *l if (!_is_valid_raid_conversion(seg->segtype, lp->segtype)) { log_error("Unable to convert %s/%s from %s to %s", lv->vg->name, lv->name, - seg->segtype->ops->name(seg), lp->segtype->name); + lvseg_name(seg), lp->segtype->name); return 0; } @@ -2672,7 +2672,7 @@ static int _lvconvert_thin(struct cmd_context *cmd, lv_is_thin_pool_data(lv) || lv_is_thin_pool_metadata(lv)) { log_error("Can't use %s %s as external origin.", - first_seg(lv)->segtype->name, + lvseg_name(first_seg(lv)), display_lvname(lv)); return 0; } @@ -3294,8 +3294,7 @@ static int _lvconvert_single(struct cmd_context *cmd, struct logical_volume *lv, if (arg_count(cmd, use_policies_ARG)) return ECMD_PROCESSED; /* nothing to be done here */ log_error("Can't repair LV \"%s\" of segtype %s.", - lv->name, - first_seg(lv)->segtype->ops->name(first_seg(lv))); + lv->name, lvseg_name(first_seg(lv))); return ECMD_FAILED; } }

1 0

master - file-locking: skip locking of VG_SYNC_NAMES
by Zdenek Kabelac 24 Oct '14

24 Oct '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=ab940456931ea5a5… Commit: ab940456931ea5a5a6f29f63d1b27057df3fdf75 Parent: 9351dca86393f862a6b2c270d5869407a4614d8a Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Oct 21 14:47:46 2014 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Oct 24 16:39:30 2014 +0200 file-locking: skip locking of VG_SYNC_NAMES VG_SYNC_NAMES is internal name with different meaning, there is no point to search it in cache. --- WHATS_NEW | 1 + lib/locking/file_locking.c | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 38a4d1b..4d2a6d2 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.112 - ===================================== + Skip trying to file lock virtual internal vg name. Fix selection on {vg,lv}_permissions fields to properly match selection criteria. Fix lv_permissions reporting to display read-only{-override} instead of blank. Fix liblvm2cmd and lvm shell to respect quotes around args in cmd line string. diff --git a/lib/locking/file_locking.c b/lib/locking/file_locking.c index 5fd0ed3..0595752 100644 --- a/lib/locking/file_locking.c +++ b/lib/locking/file_locking.c @@ -60,12 +60,11 @@ static int _file_lock_resource(struct cmd_context *cmd, const char *resource, return_0; break; case LCK_VG: - /* Skip cache refresh for VG_GLOBAL - the caller handles it */ - if (strcmp(resource, VG_GLOBAL)) - lvmcache_drop_metadata(resource, 0); - - if (!strcmp(resource, VG_SYNC_NAMES)) + if (!strcmp(resource, VG_SYNC_NAMES)) { fs_unlock(); + } else if (strcmp(resource, VG_GLOBAL)) + /* Skip cache refresh for VG_GLOBAL - the caller handles it */ + lvmcache_drop_metadata(resource, 0); /* LCK_CACHE does not require a real lock */ if (flags & LCK_CACHE)

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
17
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits October 2014