lvm2-commits July 2017

lvm2-commits@lists.fedorahosted.org

5 participants
159 discussions

master - tidy: declaration names match implementation
by Zdenek Kabelac 20 Jul '17

20 Jul '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=876c4a1b3bdf2d2f92024… Commit: 876c4a1b3bdf2d2f9202438a406a803efa01bf9a Parent: 39ebacdb5a4df1c9e1ef1258082de40d0bff1cba Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jul 20 19:13:32 2017 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jul 20 19:16:41 2017 +0200 tidy: declaration names match implementation Put in sync some naming used for function declaration and actual in-code implementation. --- lib/activate/activate.h | 6 ++-- lib/cache/lvmcache.h | 2 +- lib/format_text/import-export.h | 2 +- lib/metadata/lv.h | 2 +- lib/metadata/lv_alloc.h | 16 +++++++------- lib/metadata/metadata-exported.h | 42 +++++++++++++++++++------------------- lib/metadata/metadata.h | 18 ++++++++-------- lib/metadata/pv.h | 2 +- lib/metadata/pv_map.h | 2 +- 9 files changed, 46 insertions(+), 46 deletions(-) diff --git a/lib/activate/activate.h b/lib/activate/activate.h index 09d25c5..25b7cc8 100644 --- a/lib/activate/activate.h +++ b/lib/activate/activate.h @@ -174,7 +174,7 @@ int lv_raid_dev_health(const struct logical_volume *lv, char **dev_health); int lv_raid_mismatch_count(const struct logical_volume *lv, uint64_t *cnt); int lv_raid_sync_action(const struct logical_volume *lv, char **sync_action); int lv_raid_message(const struct logical_volume *lv, const char *msg); -int lv_cache_status(const struct logical_volume *lv, +int lv_cache_status(const struct logical_volume *cache_lv, struct lv_status_cache **status); int lv_thin_pool_percent(const struct logical_volume *lv, int metadata, dm_percent_t *percent); @@ -202,12 +202,12 @@ int lv_has_target_type(struct dm_pool *mem, const struct logical_volume *lv, const char *layer, const char *target_type); int monitor_dev_for_events(struct cmd_context *cmd, const struct logical_volume *lv, - const struct lv_activate_opts *laopts, int do_reg); + const struct lv_activate_opts *laopts, int monitor); #ifdef DMEVENTD # include "libdevmapper-event.h" char *get_monitor_dso_path(struct cmd_context *cmd, const char *libpath); -int target_registered_with_dmeventd(struct cmd_context *cmd, const char *libpath, +int target_registered_with_dmeventd(struct cmd_context *cmd, const char *dso, const struct logical_volume *lv, int *pending); int target_register_events(struct cmd_context *cmd, const char *dso, const struct logical_volume *lv, int evmask __attribute__((unused)), int set, int timeout); diff --git a/lib/cache/lvmcache.h b/lib/cache/lvmcache.h index 4b8b942..847c208 100644 --- a/lib/cache/lvmcache.h +++ b/lib/cache/lvmcache.h @@ -181,7 +181,7 @@ int lvmcache_foreach_ba(struct lvmcache_info *info, int (*fun)(struct disk_locn *, void *), void *baton); -int lvmcache_foreach_pv(struct lvmcache_vginfo *vg, +int lvmcache_foreach_pv(struct lvmcache_vginfo *vginfo, int (*fun)(struct lvmcache_info *, void *), void * baton); uint64_t lvmcache_device_size(struct lvmcache_info *info); diff --git a/lib/format_text/import-export.h b/lib/format_text/import-export.h index 4b47636..2f39e2a 100644 --- a/lib/format_text/import-export.h +++ b/lib/format_text/import-export.h @@ -64,7 +64,7 @@ int print_flags(char *buffer, size_t size, enum pv_vg_lv_e type, int mask, uint6 int read_flags(uint64_t *status, enum pv_vg_lv_e type, int mask, const struct dm_config_value *cv); int print_segtype_lvflags(char *buffer, size_t size, uint64_t status); -int read_segtype_lvflags(uint64_t *status, char *segtype_scr); +int read_segtype_lvflags(uint64_t *status, char *segtype_str); int text_vg_export_file(struct volume_group *vg, const char *desc, FILE *fp); size_t text_vg_export_raw(struct volume_group *vg, const char *desc, char **buf); diff --git a/lib/metadata/lv.h b/lib/metadata/lv.h index 9f871d6..bd6643c 100644 --- a/lib/metadata/lv.h +++ b/lib/metadata/lv.h @@ -157,7 +157,7 @@ char *lvseg_kernel_discards_dup(struct dm_pool *mem, const struct lv_segment *se int lv_set_creation(struct logical_volume *lv, const char *hostname, uint64_t timestamp); int lv_active_change(struct cmd_context *cmd, struct logical_volume *lv, - enum activation_change activate, int needs_exlusive); + enum activation_change activate, int needs_exclusive); /* LV dup functions */ char *lv_attr_dup_with_info_and_seg_status(struct dm_pool *mem, const struct lv_with_info_and_seg_status *lvdm); diff --git a/lib/metadata/lv_alloc.h b/lib/metadata/lv_alloc.h index cf2c579..df51df2 100644 --- a/lib/metadata/lv_alloc.h +++ b/lib/metadata/lv_alloc.h @@ -47,20 +47,20 @@ int release_and_discard_lv_segment_area(struct lv_segment *seg, uint32_t s, uint struct alloc_handle; struct alloc_handle *allocate_extents(struct volume_group *vg, struct logical_volume *lv, - const struct segment_type *segtype, - uint32_t stripes, - uint32_t mirrors, uint32_t log_count, - uint32_t log_region_size, uint32_t extents, - struct dm_list *allocatable_pvs, + const struct segment_type *segtype, + uint32_t stripes, + uint32_t mirrors, uint32_t log_count, + uint32_t region_size, uint32_t extents, + struct dm_list *allocatable_pvs, alloc_policy_t alloc, int approx_alloc, struct dm_list *parallel_areas); int lv_add_segment(struct alloc_handle *ah, uint32_t first_area, uint32_t num_areas, struct logical_volume *lv, - const struct segment_type *segtype, - uint32_t stripe_size, - uint64_t status, + const struct segment_type *segtype, + uint32_t stripe_size, + uint64_t status, uint32_t region_size); int lv_add_mirror_areas(struct alloc_handle *ah, diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h index 4e198d1..92b38de 100644 --- a/lib/metadata/metadata-exported.h +++ b/lib/metadata/metadata-exported.h @@ -863,9 +863,9 @@ uint32_t extents_from_percent_size(struct volume_group *vg, const struct dm_list percent_type_t percent, uint64_t size); struct logical_volume *find_pool_lv(const struct logical_volume *lv); -int pool_is_active(const struct logical_volume *pool_lv); +int pool_is_active(const struct logical_volume *lv); int pool_supports_external_origin(const struct lv_segment *pool_seg, const struct logical_volume *external_lv); -int thin_pool_feature_supported(const struct logical_volume *pool_lv, int feature); +int thin_pool_feature_supported(const struct logical_volume *lv, int feature); int recalculate_pool_chunk_size_with_dev_hints(struct logical_volume *pool_lv, int chunk_size_calc_policy); int validate_cache_chunk_size(struct cmd_context *cmd, uint32_t chunk_size); @@ -899,9 +899,9 @@ int attach_thin_external_origin(struct lv_segment *seg, struct logical_volume *external_lv); int detach_thin_external_origin(struct lv_segment *seg); int attach_pool_metadata_lv(struct lv_segment *pool_seg, - struct logical_volume *pool_metadata_lv); + struct logical_volume *metadata_lv); int detach_pool_metadata_lv(struct lv_segment *pool_seg, - struct logical_volume **pool_metadata_lv); + struct logical_volume **metadata_lv); int attach_pool_data_lv(struct lv_segment *pool_seg, struct logical_volume *pool_data_lv); int is_mirror_image_removable(struct logical_volume *mimage_lv, void *baton); @@ -1011,7 +1011,7 @@ struct logical_volume *lv_create_single(struct volume_group *vg, * skip on next activations is stored directly in metadata for each LV * as ACTIVATION_SKIP flag. */ -void lv_set_activation_skip(struct logical_volume *lv, int override_default, int add_skip_flag); +void lv_set_activation_skip(struct logical_volume *lv, int override_default, int add_skip); int lv_activation_skip(struct logical_volume *lv, activation_change_t activate, int override_lv_skip_flag); @@ -1022,7 +1022,7 @@ int insert_layer_for_segments_on_pv(struct cmd_context *cmd, struct logical_volume *lv_where, struct logical_volume *layer_lv, uint64_t status, - struct pv_list *pv, + struct pv_list *pvl, struct dm_list *lvs_changed); int remove_layers_for_segments(struct cmd_context *cmd, struct logical_volume *lv, @@ -1181,8 +1181,8 @@ int add_mirror_images(struct cmd_context *cmd, struct logical_volume *lv, uint32_t mirrors, uint32_t stripes, uint32_t stripe_size, uint32_t region_size, struct dm_list *allocatable_pvs, alloc_policy_t alloc, uint32_t log_count); -struct logical_volume *detach_mirror_log(struct lv_segment *seg); -int attach_mirror_log(struct lv_segment *seg, struct logical_volume *lv); +struct logical_volume *detach_mirror_log(struct lv_segment *mirrored_seg); +int attach_mirror_log(struct lv_segment *seg, struct logical_volume *log_lv); int remove_mirror_log(struct cmd_context *cmd, struct logical_volume *lv, struct dm_list *removable_pvs, int force); struct logical_volume *prepare_mirror_log(struct logical_volume *lv, @@ -1203,12 +1203,12 @@ int shift_mirror_images(struct lv_segment *mirrored_seg, unsigned mimage); /* ++ metadata/replicator_manip.c */ int replicator_add_replicator_dev(struct logical_volume *replicator_lv, - struct lv_segment *rdev_seg); + struct lv_segment *replicator_dev_seg); struct logical_volume *replicator_remove_replicator_dev(struct lv_segment *rdev_seg); int replicator_add_rlog(struct lv_segment *replicator_seg, struct logical_volume *rlog_lv); struct logical_volume *replicator_remove_rlog(struct lv_segment *replicator_seg); -int replicator_dev_add_slog(struct replicator_device *rdev, struct logical_volume *slog_lv); +int replicator_dev_add_slog(struct replicator_device *rdev, struct logical_volume *slog); struct logical_volume *replicator_dev_remove_slog(struct replicator_device *rdev); int replicator_dev_add_rimage(struct replicator_device *rdev, struct logical_volume *lv); struct logical_volume *replicator_dev_remove_rimage(struct replicator_device *rdev); @@ -1234,11 +1234,11 @@ int lv_raid_split(struct logical_volume *lv, int yes, const char *split_name, int lv_raid_split_and_track(struct logical_volume *lv, int yes, struct dm_list *splittable_pvs); -int lv_raid_merge(struct logical_volume *lv); +int lv_raid_merge(struct logical_volume *image_lv); int lv_raid_convert(struct logical_volume *lv, const struct segment_type *new_segtype, int yes, int force, - const unsigned stripes, + const unsigned new_stripes, const unsigned new_stripe_size_supplied, const unsigned new_stripe_size, const uint32_t new_region_size, @@ -1247,7 +1247,7 @@ int lv_raid_rebuild(struct logical_volume *lv, struct dm_list *rebuild_pvs); int lv_raid_replace(struct logical_volume *lv, int force, struct dm_list *remove_pvs, struct dm_list *allocate_pvs); int lv_raid_remove_missing(struct logical_volume *lv); -int partial_raid_lv_supports_degraded_activation(const struct logical_volume *lv); +int partial_raid_lv_supports_degraded_activation(const struct logical_volume *clv); uint32_t raid_rmeta_extents_delta(struct cmd_context *cmd, uint32_t rimage_extents_cur, uint32_t rimage_extents_new, uint32_t region_size, uint32_t extent_size); @@ -1271,11 +1271,11 @@ struct lv_status_cache { }; const char *display_cache_mode(const struct lv_segment *seg); -const char *get_cache_mode_name(const struct lv_segment *cache_seg); +const char *get_cache_mode_name(const struct lv_segment *pool_seg); int set_cache_mode(cache_mode_t *mode, const char *cache_mode); -int cache_set_cache_mode(struct lv_segment *cache_seg, cache_mode_t mode); -int cache_set_metadata_format(struct lv_segment *cache_seg, cache_metadata_format_t format); -int cache_set_policy(struct lv_segment *cache_seg, const char *name, +int cache_set_cache_mode(struct lv_segment *seg, cache_mode_t mode); +int cache_set_metadata_format(struct lv_segment *seg, cache_metadata_format_t format); +int cache_set_policy(struct lv_segment *seg, const char *name, const struct dm_config_tree *settings); int cache_set_params(struct lv_segment *seg, uint32_t chunk_size, @@ -1295,8 +1295,8 @@ int update_cache_pool_params(struct cmd_context *cmd, int validate_lv_cache_chunk_size(struct logical_volume *pool_lv, uint32_t chunk_size); int validate_lv_cache_create_pool(const struct logical_volume *pool_lv); int validate_lv_cache_create_origin(const struct logical_volume *origin_lv); -struct logical_volume *lv_cache_create(struct logical_volume *pool, - struct logical_volume *origin); +struct logical_volume *lv_cache_create(struct logical_volume *pool_lv, + struct logical_volume *origin_lv); int lv_cache_wait_for_clean(struct logical_volume *cache_lv, int *is_clean); int lv_cache_remove(struct logical_volume *cache_lv); int wipe_cache_pool(struct logical_volume *cache_pool_lv); @@ -1324,7 +1324,7 @@ struct dm_list *lvs_using_lv(struct cmd_context *cmd, struct volume_group *vg, struct logical_volume *lv); uint32_t find_free_lvnum(struct logical_volume *lv); -dm_percent_t copy_percent(const struct logical_volume *lv_mirr); +dm_percent_t copy_percent(const struct logical_volume *lv); char *generate_lv_name(struct volume_group *vg, const char *format, char *buffer, size_t len); char *top_level_lv_name(struct volume_group *vg, const char *lv_name); @@ -1335,7 +1335,7 @@ struct glv_list *get_or_create_glvl(struct dm_pool *mem, struct logical_volume * /* * Begin skeleton for external LVM library */ -int pv_change_metadataignore(struct physical_volume *pv, uint32_t mda_ignore); +int pv_change_metadataignore(struct physical_volume *pv, uint32_t mda_ignored); int vg_flag_write_locked(struct volume_group *vg); diff --git a/lib/metadata/metadata.h b/lib/metadata/metadata.h index a9eceaa..ab3db4a 100644 --- a/lib/metadata/metadata.h +++ b/lib/metadata/metadata.h @@ -172,7 +172,7 @@ struct metadata_area *mda_copy(struct dm_pool *mem, struct metadata_area *mda); unsigned mda_is_ignored(struct metadata_area *mda); -void mda_set_ignored(struct metadata_area *mda, unsigned ignored); +void mda_set_ignored(struct metadata_area *mda, unsigned mda_ignored); unsigned mda_locns_match(struct metadata_area *mda1, struct metadata_area *mda2); struct device *mda_get_device(struct metadata_area *mda); @@ -405,7 +405,7 @@ int check_new_thin_pool(const struct logical_volume *pool_lv); /* * Remove a dev_dir if present. */ -const char *strip_dir(const char *vg_name, const char *dir); +const char *strip_dir(const char *vg_name, const char *dev_dir); struct logical_volume *alloc_lv(struct dm_pool *mem); @@ -423,7 +423,7 @@ int lv_has_constant_stripes(struct logical_volume *lv); /* * Checks that a replicator segment is correct. */ -int check_replicator_segment(const struct lv_segment *replicator_seg); +int check_replicator_segment(const struct lv_segment *rseg); /* * Sometimes (eg, after an lvextend), it is possible to merge two @@ -446,9 +446,9 @@ int remove_seg_from_segs_using_this_lv(struct logical_volume *lv, struct lv_segm int add_glv_to_indirect_glvs(struct dm_pool *mem, struct generic_logical_volume *origin_glv, - struct generic_logical_volume *user_glv); -int remove_glv_from_indirect_glvs(struct generic_logical_volume *glv, - struct generic_logical_volume *user_glv); + struct generic_logical_volume *glv); +int remove_glv_from_indirect_glvs(struct generic_logical_volume *origin_glv, + struct generic_logical_volume *glv); int for_each_sub_lv_except_pools(struct logical_volume *lv, int (*fn)(struct logical_volume *lv, void *data), @@ -491,20 +491,20 @@ int fixup_imported_mirrors(struct volume_group *vg); * From thin_manip.c */ int attach_pool_lv(struct lv_segment *seg, struct logical_volume *pool_lv, - struct logical_volume *origin_lv, + struct logical_volume *origin, struct generic_logical_volume *indirect_origin, struct logical_volume *merge_lv); int detach_pool_lv(struct lv_segment *seg); int attach_pool_message(struct lv_segment *pool_seg, dm_thin_message_t type, struct logical_volume *lv, uint32_t delete_id, - int auto_increment); + int no_update); int lv_is_merging_thin_snapshot(const struct logical_volume *lv); int pool_has_message(const struct lv_segment *seg, const struct logical_volume *lv, uint32_t device_id); int pool_metadata_min_threshold(const struct lv_segment *pool_seg); int pool_below_threshold(const struct lv_segment *pool_seg); int pool_check_overprovisioning(const struct logical_volume *lv); -int create_pool(struct logical_volume *lv, const struct segment_type *segtype, +int create_pool(struct logical_volume *pool_lv, const struct segment_type *segtype, struct alloc_handle *ah, uint32_t stripes, uint32_t stripe_size); /* diff --git a/lib/metadata/pv.h b/lib/metadata/pv.h index 9e8207d..e452ece 100644 --- a/lib/metadata/pv.h +++ b/lib/metadata/pv.h @@ -93,7 +93,7 @@ uint64_t pv_mda_free(const struct physical_volume *pv); uint64_t pv_used(const struct physical_volume *pv); uint32_t pv_mda_count(const struct physical_volume *pv); uint32_t pv_mda_used_count(const struct physical_volume *pv); -unsigned pv_mda_set_ignored(const struct physical_volume *pv, unsigned ignored); +unsigned pv_mda_set_ignored(const struct physical_volume *pv, unsigned mda_ignored); int is_orphan(const struct physical_volume *pv); int is_missing_pv(const struct physical_volume *pv); int is_used_pv(const struct physical_volume *pv); diff --git a/lib/metadata/pv_map.h b/lib/metadata/pv_map.h index d0f2481..4f8d0aa 100644 --- a/lib/metadata/pv_map.h +++ b/lib/metadata/pv_map.h @@ -65,7 +65,7 @@ struct pv_map { struct dm_list *create_pv_maps(struct dm_pool *mem, struct volume_group *vg, struct dm_list *allocatable_pvs); -void consume_pv_area(struct pv_area *area, uint32_t to_go); +void consume_pv_area(struct pv_area *pva, uint32_t to_go); void reinsert_changed_pv_area(struct pv_area *pva); uint32_t pv_maps_size(struct dm_list *pvms);

1 0

master - raid: reshape synchronization point
by Zdenek Kabelac 20 Jul '17

20 Jul '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=39ebacdb5a4df1c9e1ef1… Commit: 39ebacdb5a4df1c9e1ef1258082de40d0bff1cba Parent: 8e0c5d0cb6385df11c7f65a8d5eb0e846cd31dd9 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jul 20 19:04:59 2017 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jul 20 19:16:39 2017 +0200 raid: reshape synchronization point Give udev time to get in sync and give md-core time to wake up after table reload. --- WHATS_NEW | 1 + lib/metadata/raid_manip.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index a5eef63..a9b3a08 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.174 - ================================= + Add synchronization points with udev during reshape of raid LVs. Version 2.02.173 - 20th July 2017 ================================= diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c index b90d6f4..0432928 100644 --- a/lib/metadata/raid_manip.c +++ b/lib/metadata/raid_manip.c @@ -3853,6 +3853,12 @@ static int _eliminate_extracted_lvs_optional_write_vg(struct volume_group *vg, struct dm_list *removal_lvs, int vg_write_requested) { + if (!sync_local_dev_names(vg->cmd)) { + log_error("Failed to sync local devices after removing %u LVs in VG %s.", + dm_list_size(removal_lvs), vg->name); + return 0; + } + if (!removal_lvs || dm_list_empty(removal_lvs)) return 1; @@ -3868,6 +3874,13 @@ static int _eliminate_extracted_lvs_optional_write_vg(struct volume_group *vg, backup(vg); } + /* Wait for events following any deactivation. */ + if (!sync_local_dev_names(vg->cmd)) { + log_error("Failed to sync local devices after removing %u LVs in VG %s.", + dm_list_size(removal_lvs), vg->name); + return 0; + } + return 1; }

1 0

master - post-release
by Alasdair Kergon 20 Jul '17

20 Jul '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8e0c5d0cb6385df11c7f6… Commit: 8e0c5d0cb6385df11c7f65a8d5eb0e846cd31dd9 Parent: 88f15659374042f7657d73393f73e267d752b4e1 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Thu Jul 20 17:19:09 2017 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Thu Jul 20 17:19:09 2017 +0100 post-release --- VERSION | 2 +- VERSION_DM | 2 +- WHATS_NEW | 3 +++ WHATS_NEW_DM | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 44639a1..cbce772 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.02.173(2)-git (2017-07-20) +2.02.174(2)-git (2017-07-20) diff --git a/VERSION_DM b/VERSION_DM index 5123a72..a338597 100644 --- a/VERSION_DM +++ b/VERSION_DM @@ -1 +1 @@ -1.02.142-git (2017-07-20) +1.02.143-git (2017-07-20) diff --git a/WHATS_NEW b/WHATS_NEW index 4215069..a5eef63 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,3 +1,6 @@ +Version 2.02.174 - +================================= + Version 2.02.173 - 20th July 2017 ================================= Add synchronization points with udev during conversion of raid LVs. diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index c39929a..7007c95 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,3 +1,6 @@ +Version 1.02.143 - +================================= + Version 1.02.142 - 20th July 2017 ================================= Create /dev/disk/by-part{uuid,label} and gpt-auto-root symlinks with udev.

1 0

master - pre-release
by Alasdair Kergon 20 Jul '17

20 Jul '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=88f15659374042f7657d7… Commit: 88f15659374042f7657d73393f73e267d752b4e1 Parent: 7ba0017468d977cf51bfce0e708317ab84bc04e7 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Thu Jul 20 16:57:27 2017 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Thu Jul 20 16:57:27 2017 +0100 pre-release --- VERSION | 2 +- VERSION_DM | 2 +- WHATS_NEW | 8 +++++--- WHATS_NEW_DM | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/VERSION b/VERSION index e9822e0..44639a1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.02.173(2)-git (2017-06-28) +2.02.173(2)-git (2017-07-20) diff --git a/VERSION_DM b/VERSION_DM index d398102..5123a72 100644 --- a/VERSION_DM +++ b/VERSION_DM @@ -1 +1 @@ -1.02.142-git (2017-06-28) +1.02.142-git (2017-07-20) diff --git a/WHATS_NEW b/WHATS_NEW index c587a9c..4215069 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,10 +1,12 @@ -Version 2.02.173 - +Version 2.02.173 - 20th July 2017 ================================= - Add synchornization points with udev during conversion of raid LVs. + Add synchronization points with udev during conversion of raid LVs. Improve --size args validation and report more detailed error message. Initialize debugging mutex before any debug message in clvmd. - Log error instad of warn when noticing connection problem with lvmetad. + Log error instead of warn when noticing connection problem with lvmetad. Fix memory leak in lvmetad when working with duplicates. + Remove restrictions on reshaping open and clustered raid devices. + Add incompatible data_offset to raid metadata to fix reshape activation. Accept 'lvm -h' and 'lvm --help' as well as 'lvm help' for help. Suppress error message from accept() on clean lvmetad shutdown. Tidy clvmd client list processing and fix segfaults. diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index 40fb4f4..c39929a 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,4 +1,4 @@ -Version 1.02.142 - +Version 1.02.142 - 20th July 2017 ================================= Create /dev/disk/by-part{uuid,label} and gpt-auto-root symlinks with udev.

1 0

master - raid: avoid lv_size compiler warning
by Alasdair Kergon 20 Jul '17

20 Jul '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=7ba0017468d977cf51bfc… Commit: 7ba0017468d977cf51bfce0e708317ab84bc04e7 Parent: c78316b7a5341aa9259c118988e659d38ef862f2 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Thu Jul 20 16:16:51 2017 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Thu Jul 20 16:16:51 2017 +0100 raid: avoid lv_size compiler warning warning: declaration of ��lv_size�� shadows a global declaration --- lib/metadata/raid_manip.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c index e275da1..b90d6f4 100644 --- a/lib/metadata/raid_manip.c +++ b/lib/metadata/raid_manip.c @@ -1526,7 +1526,7 @@ static int _lv_relocate_reshape_space(struct logical_volume *lv, enum alloc_wher /* HM Helper: reset @lv to @segtype, @stripe_size and @lv_size post lv_extend() when changed for area_count < 3. */ static int _lv_alloc_reshape_post_extend(struct logical_volume *lv, const struct segment_type *segtype, - uint32_t stripe_size, uint64_t lv_size) + uint32_t stripe_size, uint64_t lv_size_cur) { struct lv_segment *seg = first_seg(lv); @@ -1534,7 +1534,7 @@ static int _lv_alloc_reshape_post_extend(struct logical_volume *lv, /* Reset segment type, stripe and lv size */ seg->segtype = segtype; seg->stripe_size = stripe_size; - lv->size = lv_size; + lv->size = lv_size_cur; /* Update and reload mapping for proper size of data SubLVs in the cluster */ if (!lv_update_and_reload(lv))

1 0

master - raid: move syncing with udev into function
by Zdenek Kabelac 20 Jul '17

20 Jul '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c78316b7a5341aa9259c1… Commit: c78316b7a5341aa9259c118988e659d38ef862f2 Parent: 7b048f6b43a7cb752bae44fbed0da8508b24b959 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jul 20 13:46:39 2017 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jul 20 13:52:18 2017 +0200 raid: move syncing with udev into function Since _deactivate_and_remove_lvs() is used in more then one place, move the needed udev synchronization into this function so other users automatically get correct fs state before next dm manipulation. Assumption here is that this udev synchronization 'delay' may also prevent to 'early' table reloads which might cause kernel problems for md-core - but we may need more generic time-limited reload frequency for raid devices. Note: on udev-less system there will be almost no delay. --- WHATS_NEW | 1 + lib/metadata/raid_manip.c | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 48ec679..c587a9c 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.173 - ================================= + Add synchornization points with udev during conversion of raid LVs. Improve --size args validation and report more detailed error message. Initialize debugging mutex before any debug message in clvmd. Log error instad of warn when noticing connection problem with lvmetad. diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c index 895bb73..e275da1 100644 --- a/lib/metadata/raid_manip.c +++ b/lib/metadata/raid_manip.c @@ -329,6 +329,13 @@ static int _deactivate_and_remove_lvs(struct volume_group *vg, struct dm_list *r return_0; } + /* Wait for events following any deactivation. */ + if (!sync_local_dev_names(vg->cmd)) { + log_error("Failed to sync local devices after removing %u LVs in VG %s.", + dm_list_size(removal_lvs), vg->name); + return 0; + } + return 1; } @@ -3852,13 +3859,6 @@ static int _eliminate_extracted_lvs_optional_write_vg(struct volume_group *vg, if (!_deactivate_and_remove_lvs(vg, removal_lvs)) return_0; - /* Wait for events following any deactivation. */ - if (!sync_local_dev_names(vg->cmd)) { - log_error("Failed to sync local devices after removing %u LVs in VG %s.", - dm_list_size(removal_lvs), vg->name); - return 0; - } - dm_list_init(removal_lvs); if (vg_write_requested) {

1 0

master - tests: aus.sh fix md teardown
by Zdenek Kabelac 20 Jul '17

20 Jul '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=7b048f6b43a7cb752bae4… Commit: 7b048f6b43a7cb752bae44fbed0da8508b24b959 Parent: 48ce8c7a49a963a3d1357ad2b964f46902a2c163 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jul 20 12:15:06 2017 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jul 20 12:16:27 2017 +0200 tests: aus.sh fix md teardown Commit 8a912d6dbcc34ce2b76a0104c39de7aa0480c512 missed the wrong logic, we use 2 vars 'dev' & 'mddev' and their usage can't be mixed. So correctly separate them so mddev keeps name of MD device. --- test/lib/aux.sh | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index e620e81..b8a0cc0 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -778,10 +778,11 @@ cleanup_md_dev() { local IFS=$IFS_NL local dev - dev=$(< MD_DEV) + local mddev + mddev=$(< MD_DEV) udev_wait - mdadm --stop "$dev" || true - test "$DM_DEV_DIR" != "/dev" && rm -f "$DM_DEV_DIR/$(basename "$dev")" + mdadm --stop "$mddev" || true + test "$DM_DEV_DIR" != "/dev" && rm -f "$DM_DEV_DIR/$(basename "$mddev")" notify_lvmetad "$(< MD_DEV_PV)" udev_wait # wait till events are process, not zeroing to early for dev in $(< MD_DEVICES); do @@ -789,12 +790,12 @@ cleanup_md_dev() { notify_lvmetad "$dev" done udev_wait - if [ -b "$dev" ]; then + if [ -b "$mddev" ]; then # mdadm doesn't always cleanup the device node # sleeps offer hack to defeat: 'md: md127 still in use' # see: https://bugzilla.redhat.com/show_bug.cgi?id=509908#c25 sleep 2 - rm -f "$dev" + rm -f "$mddev" fi rm -f MD_DEV MD_DEVICES MD_DEV_PV }

1 0

master - tidy: drop unneeded cast
by Zdenek Kabelac 20 Jul '17

20 Jul '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=48ce8c7a49a963a3d1357… Commit: 48ce8c7a49a963a3d1357ad2b964f46902a2c163 Parent: 4a2994b7b1ff4a09f250f6389894a3072d7e3acd Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jul 20 09:57:09 2017 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jul 20 11:20:44 2017 +0200 tidy: drop unneeded cast Avoid casting to the same type. --- lib/device/dev-type.c | 2 +- lib/format_text/format-text.c | 6 +++--- lib/metadata/metadata.c | 2 +- lib/metadata/pv_manip.c | 10 +++++----- lib/metadata/raid_manip.c | 2 +- liblvm/lvm_lv.c | 3 +-- liblvm/lvm_vg.c | 2 +- tools/command.c | 4 ++-- tools/toollib.c | 4 ++-- 9 files changed, 17 insertions(+), 18 deletions(-) diff --git a/lib/device/dev-type.c b/lib/device/dev-type.c index aa22e3b..05e5bef 100644 --- a/lib/device/dev-type.c +++ b/lib/device/dev-type.c @@ -76,7 +76,7 @@ struct dev_types *create_dev_types(const char *proc_dir, i++; /* If it's not a number it may be name of section */ - line_maj = atoi(((char *) (line + i))); + line_maj = atoi(line + i); if (line_maj < 0 || line_maj >= NUMBER_OF_MAJORS) { /* diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index 91f8816..7db4637 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -2291,9 +2291,9 @@ static int _text_pv_add_metadata_area(const struct format_type *fmt, } /* Wipe metadata area with zeroes. */ - if (!dev_set((struct device *) pv->dev, mda_start, - (size_t) ((mda_size > wipe_size) ? - wipe_size : mda_size), 0)) { + if (!dev_set(pv->dev, mda_start, + (size_t) ((mda_size > wipe_size) ? + wipe_size : mda_size), 0)) { log_error("Failed to wipe new metadata area " "at the %s of the %s", mda_index ? "end" : "start", diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index ce2e3cc..bbbf7d0 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -1294,7 +1294,7 @@ static dm_bitset_t _bitset_with_random_bits(struct dm_pool *mem, uint32_t num_bi char buf[32]; uint32_t i = num_bits - num_set_bits; - if (!(bs = dm_bitset_create(mem, (unsigned) num_bits))) { + if (!(bs = dm_bitset_create(mem, num_bits))) { log_error("Failed to allocate bitset for setting random bits."); return NULL; } diff --git a/lib/metadata/pv_manip.c b/lib/metadata/pv_manip.c index de6644e..f37bc4c 100644 --- a/lib/metadata/pv_manip.c +++ b/lib/metadata/pv_manip.c @@ -648,23 +648,23 @@ int pv_resize_single(struct cmd_context *cmd, log_warn("WARNING: %s: Overriding real size %s. You could lose data.", pv_name, display_size(cmd, (uint64_t) size)); if (!yes && yes_no_prompt("%s: Requested size %s exceeds real size %s. Proceed? [y/n]: ", - pv_name, display_size(cmd, (uint64_t) new_size), - display_size(cmd, (uint64_t) size)) == 'n') { + pv_name, display_size(cmd, new_size), + display_size(cmd, size)) == 'n') { log_error("Physical Volume %s not resized.", pv_name); goto_out; } } else if (new_size < size) if (!yes && yes_no_prompt("%s: Requested size %s is less than real size %s. Proceed? [y/n]: ", - pv_name, display_size(cmd, (uint64_t) new_size), - display_size(cmd, (uint64_t) size)) == 'n') { + pv_name, display_size(cmd, new_size), + display_size(cmd, size)) == 'n') { log_error("Physical Volume %s not resized.", pv_name); goto_out; } if (new_size == size) log_verbose("%s: Size is already %s (%" PRIu64 " sectors).", - pv_name, display_size(cmd, (uint64_t) new_size), new_size); + pv_name, display_size(cmd, new_size), new_size); else log_warn("WARNING: %s: Pretending size is %" PRIu64 " not %" PRIu64 " sectors.", pv_name, new_size, size); diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c index d96eceb..895bb73 100644 --- a/lib/metadata/raid_manip.c +++ b/lib/metadata/raid_manip.c @@ -1834,7 +1834,7 @@ static int _reshape_adjust_to_size(struct logical_volume *lv, /* Externally visible LV size w/o reshape space */ lv->le_count = seg->len = new_le_count; - lv->size = (uint64_t) (lv->le_count - new_image_count * (uint32_t) _reshape_len_per_dev(seg)) * lv->vg->extent_size; + lv->size = (uint64_t) (lv->le_count - new_image_count * _reshape_len_per_dev(seg)) * lv->vg->extent_size; /* seg->area_len does not change */ if (old_image_count < new_image_count) { diff --git a/liblvm/lvm_lv.c b/liblvm/lvm_lv.c index 13d6cbf..580e942 100644 --- a/liblvm/lvm_lv.c +++ b/liblvm/lvm_lv.c @@ -65,8 +65,7 @@ const char *lvm_lv_get_name(const lv_t lv) { const char *rc; struct saved_env e = store_user_env(lv->vg->cmd); - rc = dm_pool_strndup(lv->vg->vgmem, (const char *)lv->name, - NAME_LEN+1); + rc = dm_pool_strndup(lv->vg->vgmem, lv->name, NAME_LEN+1); restore_user_env(&e); return rc; } diff --git a/liblvm/lvm_vg.c b/liblvm/lvm_vg.c index 8f83230..5593579 100644 --- a/liblvm/lvm_vg.c +++ b/liblvm/lvm_vg.c @@ -444,7 +444,7 @@ const char *lvm_vg_get_name(const vg_t vg) { const char *rc; struct saved_env e = store_user_env(vg->cmd); - rc = dm_pool_strndup(vg->vgmem, (const char *)vg->name, NAME_LEN+1); + rc = dm_pool_strndup(vg->vgmem, vg->name, NAME_LEN+1); restore_user_env(&e); return rc; } diff --git a/tools/command.c b/tools/command.c index a37d64d..b4e5e76 100644 --- a/tools/command.c +++ b/tools/command.c @@ -1337,8 +1337,8 @@ int command_has_alternate_extents(const char *name) static int long_name_compare(const void *on1, const void *on2) { - const struct opt_name * const *optname1 = (const void *)on1; - const struct opt_name * const *optname2 = (const void *)on2; + const struct opt_name * const *optname1 = on1; + const struct opt_name * const *optname2 = on2; return strcmp((*optname1)->long_opt + 2, (*optname2)->long_opt + 2); } diff --git a/tools/toollib.c b/tools/toollib.c index 5e3fedd..c2807b8 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -4871,8 +4871,8 @@ static void _check_pvcreate_prompt(struct cmd_context *cmd, } else if (ask) { if (prompt->new_size != prompt->size) { if (yes_no_prompt("WARNING: %s: device size %s does not match requested size %s. Proceed? [y/n]: ", pvname, - display_size(cmd, (uint64_t)prompt->size), - display_size(cmd, (uint64_t)prompt->new_size)) == 'n') { + display_size(cmd, prompt->size), + display_size(cmd, prompt->new_size)) == 'n') { answer_no = 1; } else { answer_yes = 1;

1 0

master - tidy: name all parameters
by Zdenek Kabelac 20 Jul '17

20 Jul '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4a2994b7b1ff4a09f250f… Commit: 4a2994b7b1ff4a09f250f6389894a3072d7e3acd Parent: 1fd8785ff30261d25cce2f98a8e5c566d34d3151 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jul 20 10:30:00 2017 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jul 20 11:20:26 2017 +0200 tidy: name all parameters --- lib/metadata/metadata.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index d8f993c..ce2e3cc 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -2389,7 +2389,7 @@ struct _lv_postorder_baton { void *data; }; -static int _lv_postorder_visit(struct logical_volume *, +static int _lv_postorder_visit(struct logical_volume *lv, int (*fn)(struct logical_volume *lv, void *data), void *data);

1 0

master - tidy: drop unneeded return
by Zdenek Kabelac 20 Jul '17

20 Jul '17

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=1fd8785ff30261d25cce2… Commit: 1fd8785ff30261d25cce2f98a8e5c566d34d3151 Parent: 4ef6cfc882fd89ee23a12be11d631b691f7e8ddf Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Jul 19 23:53:16 2017 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jul 20 11:20:22 2017 +0200 tidy: drop unneeded return --- daemons/clvmd/clvmd-openais.c | 2 -- daemons/clvmd/clvmd.c | 2 -- lib/cache/lvmcache.c | 2 -- tools/command.c | 2 -- 4 files changed, 0 insertions(+), 8 deletions(-) diff --git a/daemons/clvmd/clvmd-openais.c b/daemons/clvmd/clvmd-openais.c index 2f1a4fd..6e09bf6 100644 --- a/daemons/clvmd/clvmd-openais.c +++ b/daemons/clvmd/clvmd-openais.c @@ -425,8 +425,6 @@ static void _add_up_node(const char *csid) DEBUGLOG("openais_add_up_node %d\n", ninfo->nodeid); ninfo->state = NODE_CLVMD; - - return; } /* Call a callback for each node, so the caller knows whether it's up or down */ diff --git a/daemons/clvmd/clvmd.c b/daemons/clvmd/clvmd.c index 7506dca..79aa939 100644 --- a/daemons/clvmd/clvmd.c +++ b/daemons/clvmd/clvmd.c @@ -2311,13 +2311,11 @@ static void ntoh_clvm(struct clvm_header *hdr) static void sigusr2_handler(int sig) { DEBUGLOG("SIGUSR2 received\n"); - return; } static void sigterm_handler(int sig) { quit = 1; - return; } static void sighup_handler(int sig) diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c index 8431ca1..c51e157 100644 --- a/lib/cache/lvmcache.c +++ b/lib/cache/lvmcache.c @@ -1600,8 +1600,6 @@ void lvmcache_del(struct lvmcache_info *info) info->label->labeller->ops->destroy_label(info->label->labeller, info->label); dm_free(info); - - return; } /* diff --git a/tools/command.c b/tools/command.c index bd3c7cc..a37d64d 100644 --- a/tools/command.c +++ b/tools/command.c @@ -1965,10 +1965,8 @@ void print_usage(struct command *cmd, int longhelp, int desc_first) _print_usage_description(cmd); printf("\n"); - return; } - void print_usage_common_lvm(struct command_name *cname, struct command *cmd) { int oo, opt_enum;

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits July 2017