Const fixes
cover Const fixes
Primary reason for this patchset is to make stronger const limitation around config_tree handling. So we can be sure where this tree could be modified. It also cleanup quite a few hidden const warning (-Wbad-function-cast -Wcast-qual)
Patch is extended with few more minor patches gathers from my tree which should be easy to review. Some of them are probably some minor bugs in the code so it's worth to check them in.
Zdenek Kabelac (20):
Add more strict const pointers around config tree Const fixes and additions
Use const char* const *
Remove wrong cast to (char*)
Remove const from destroy callback
Replace void* arithmetic with char*
Use const char * arithmetic for offset calculation Use const char * for name and old_name in vg Replace stack trace with failure exit path Simplify usage fprintf clvmd
Add test for 'read' result
Add test for allocation results for node clonning Properly use dm_free
Remove dead store in _clog_ctr
Remove dead assignment in _init_logging Remove dead store in lvm_run_command Remove dead assignment in dev_manager_transient Remove dead assignment in _remove
Remove unused dev_dir_provided
Add internal error if pointer is uninitialized
daemons/clvmd/clvmd.c | 41 ++++++++-------- daemons/cmirrord/functions.c | 32 +++++------- lib/activate/activate.c | 6 +- lib/activate/dev_manager.c | 2 +- lib/commands/toolcontext.c | 17 +++---- lib/config/config.c | 100 ++++++++++++++++++++++---------------- lib/config/config.h | 14 +++--- lib/datastruct/btree.c | 2 +- lib/device/dev-cache.c | 6 +- lib/error/errseg.c | 4 +- lib/filters/filter-persistent.c | 2 +- lib/filters/filter-regex.c | 8 ++-- lib/filters/filter-regex.h | 2 +- lib/filters/filter.c | 4 +- lib/format1/format1.c | 4 +- lib/format_pool/disk_rep.c | 5 ++ lib/format_pool/format_pool.c | 6 +- lib/format_text/flags.c | 2 +- lib/format_text/format-text.c | 12 ++-- lib/format_text/import-export.h | 12 ++-- lib/format_text/import.c | 2 +- lib/format_text/import_vsn1.c | 67 +++++++++++++------------- lib/format_text/tags.c | 2 +- lib/freeseg/freeseg.c | 4 +- lib/metadata/lv_manip.c | 4 +- lib/metadata/metadata.h | 4 +- lib/metadata/segtype.h | 4 +- lib/metadata/vg.h | 4 +- lib/mirror/mirrored.c | 8 ++-- lib/mm/memlock.c | 2 +- lib/replicator/replicator.c | 8 ++-- lib/snapshot/snapshot.c | 4 +- lib/striped/striped.c | 6 +- lib/unknown/unknown.c | 4 +- lib/zero/zero.c | 4 +- libdm/libdevmapper.h | 4 +- libdm/regex/matcher.c | 2 +- liblvm/lvm_base.c | 2 +- tools/dmsetup.c | 10 ++-- tools/lvmcmdline.c | 20 +++++--- tools/toollib.c | 2 - 41 files changed, 232 insertions(+), 216 deletions(-)
Signature · 1 line
1.7.3.3
PATCH 1/20 Add more strict const pointers around config tree
To have better control were config tree could be modified use more const pointers and very carefully downcast them back to non-const.
--- lib/activate/activate.c | 4 +- lib/commands/toolcontext.c | 14 ++++---- lib/config/config.c | 49 +++++++++++++++------------- lib/config/config.h | 14 ++++---- lib/device/dev-cache.c | 2 +- lib/filters/filter-persistent.c | 2 +- lib/filters/filter-regex.c | 6 ++-- lib/filters/filter-regex.h | 2 +- lib/filters/filter.c | 4 +- lib/format_text/flags.c | 2 +- lib/format_text/format-text.c | 8 ++-- lib/format_text/import-export.h | 12 +++--- lib/format_text/import_vsn1.c | 67 ++++++++++++++++++++------------------- lib/format_text/tags.c | 2 +- lib/metadata/lv_manip.c | 4 +- lib/metadata/segtype.h | 2 +- lib/mirror/mirrored.c | 4 +- lib/mm/memlock.c | 2 +- lib/replicator/replicator.c | 4 +- lib/striped/striped.c | 2 +- 20 files changed, 105 insertions(+), 101 deletions(-)
lib/activate/activate.c +2 -2
@@ -260,8 +260,8 @@ static int _passes_activation_filter(struct cmd_context *cmd, struct logical_volume *lv) {const struct config_node *cn; -struct config_value *cv; -char *str; +const struct config_value *cv; +const char *str;char path[PATH_MAX ];if (!(cn =find_config_tree_node (cmd,"activation/volume_list" ))) {
lib/commands/toolcontext.c +7 -7
@@ -204,7 +204,7 @@ static int _process_config(struct cmd_context *cmd)const char *read_ahead;struct stat st;const struct config_node *cn; -struct config_value *cv; +const struct config_value *cv;/* umask */ cmd->default_settings.umask = find_config_tree_int(cmd,
@@ -332,11 +332,11 @@ static int _set_tag(struct cmd_context *cmd, const char *tag)return 1 ; } -static int _check_host_filters (struct cmd_context *cmd,struct config_node *hn, +static int _check_host_filters (struct cmd_context *cmd,const struct config_node *hn,int *passes) { -struct config_node *cn; -struct config_value *cv; +const struct config_node *cn; +const struct config_value *cv; *passes =1 ;
@@ -561,7 +561,7 @@ static void _destroy_tag_configs(struct cmd_context *cmd)static int _init_dev_cache (struct cmd_context *cmd) {const struct config_node *cn; -struct config_value *cv; +const struct config_value *cv; init_dev_disable_after_error_count( find_config_tree_int(cmd, "devices/disable_after_error_count",
@@ -793,7 +793,7 @@ static int _init_formats(struct cmd_context *cmd)if (!is_static () && (cn =find_config_tree_node (cmd,"global/format_libraries" ))) { -struct config_value *cv; +const struct config_value *cv;struct format_type *(*init_format_fn) (struct cmd_context *);void *lib;
@@ -959,7 +959,7 @@ static int _init_segtypes(struct cmd_context *cmd)if (!is_static () && (cn =find_config_tree_node (cmd,"global/segment_libraries" ))) { -struct config_value *cv; +const struct config_value *cv;int (*init_multiple_segtypes_fn) (struct cmd_context *,struct segtype_library *);
lib/config/config.c +26 -23
144 lines not on this page · raw message
lib/config/config.h +7 -7
@@ -33,13 +33,13 @@ struct config_value {union {int64_t i;float r; -char *str; +const char *str; } v;struct config_value *next;/* for arrays */ };struct config_node { -char *key; +const char *key;struct config_node *parent, *sib, *child;struct config_value *v; };
@@ -78,8 +78,8 @@ int config_file_changed(struct config_tree *cft);int merge_config_tree (struct cmd_context *cmd,struct config_tree *cft,struct config_tree *newdata); -struct config_node *find_config_node (const struct config_node *cn, -const char *path); +const struct config_node *find_config_node (const struct config_node *cn, +const char *path);const char *find_config_str (const struct config_node *cn,const char *path,const char *fail);int find_config_int (const struct config_node *cn,const char *path,int fail);
@@ -89,8 +89,8 @@ float find_config_float(const struct config_node *cn, const char *path,/* * These versions check an override tree, if present, first. */ -struct config_node *find_config_tree_node (struct cmd_context *cmd, -const char *path); +const struct config_node *find_config_tree_node (struct cmd_context *cmd, +const char *path);const char *find_config_tree_str (struct cmd_context *cmd,const char *path,const char *fail); int find_config_tree_int(struct cmd_context *cmd, const char *path,
@@ -112,7 +112,7 @@ int get_config_uint64(const struct config_node *cn, const char *path, uint64_t *result);int get_config_str (const struct config_node *cn,const char *path, -char **result); +const char **result);unsigned maybe_config_section (const char *str,unsigned len);
lib/device/dev-cache.c +1 -1
@@ -541,7 +541,7 @@ void dev_cache_scan(int do_scan)static int _init_preferred_names (struct cmd_context *cmd) {const struct config_node *cn; -struct config_value *v; +const struct config_value *v;struct dm_pool *scratch =NULL ;char **regex;unsigned count =0 ;
lib/filters/filter-persistent.c +1 -1
@@ -68,7 +68,7 @@ static int _read_array(struct pfilter *pf, struct config_tree *cft, const char *path, void *data) { const struct config_node *cn; -struct config_value *cv; +const struct config_value *cv;if (!(cn =find_config_node (cft->root, path))) { log_very_verbose("Couldn't find %s array in '%s'",
lib/filters/filter-regex.c +3 -3
@@ -87,10 +87,10 @@ static int _extract_pattern(struct dm_pool *mem, const char *pat,return 1 ; } -static int _build_matcher (struct rfilter *rf,struct config_value *val) +static int _build_matcher (struct rfilter *rf,const struct config_value *val) {struct dm_pool *scratch; -struct config_value *v; +const struct config_value *v;char **regex;unsigned count =0 ;int i, r =0 ;
@@ -188,7 +188,7 @@ static void _regex_destroy(struct dev_filter *f)dm_pool_destroy (rf->mem); } -struct dev_filter *regex_filter_create (struct config_value *patterns) +struct dev_filter *regex_filter_create (const struct config_value *patterns) {struct dm_pool *mem =dm_pool_create ("filter regex" ,10 *1024 );struct rfilter *rf;
lib/filters/filter-regex.h +1 -1
@@ -27,6 +27,6 @@* r|.*| - reject everything else */ -struct dev_filter *regex_filter_create (struct config_value *patterns); +struct dev_filter *regex_filter_create (const struct config_value *patterns);#endif
lib/filters/filter.c +2 -2
@@ -185,8 +185,8 @@ static int _scan_proc_dev(const char *proc, const struct config_node *cn)int line_maj =0 ;int blocksection =0 ;size_t dev_len =0 ; -struct config_value *cv; -char *name; +const struct config_value *cv; +const char *name;if (!*proc) {
lib/format_text/flags.c +1 -1
@@ -138,7 +138,7 @@ int print_flags(uint64_t status, int type, char *buffer, size_t size)return 1 ; } -int read_flags (uint64_t *status,int type,struct config_value *cv) +int read_flags (uint64_t *status,int type,const struct config_value *cv) {int f;uint64_t s =UINT64_C (0 );
lib/format_text/format-text.c +4 -4
@@ -2078,10 +2078,10 @@ static int _add_dir(const char *dir, struct dm_list *dir_list) }static int _get_config_disk_area (struct cmd_context *cmd, -struct config_node *cn,struct dm_list *raw_list) +const struct config_node *cn,struct dm_list *raw_list) {struct device_area dev_area; -char *id_str; +const char *id_str;struct id id;if (!(cn = cn->child)) {
@@ -2133,8 +2133,8 @@ static int _get_config_disk_area(struct cmd_context *cmd,struct format_type *create_text_format (struct cmd_context *cmd) {struct format_type *fmt; -struct config_node *cn; -struct config_value *cv; +const struct config_node *cn; +const struct config_value *cv;struct mda_lists *mda_lists;if (!(fmt =dm_malloc (sizeof (*fmt))))
lib/format_text/import-export.h +6 -6
@@ -44,14 +44,14 @@ enum { };struct text_vg_version_ops { -int (*check_version) (struct config_tree * cf); +int (*check_version) (const struct config_tree * cf);struct volume_group *(*read_vg) (struct format_instance * fid, -struct config_tree * cf, +const struct config_tree *cf,unsigned use_cached_pvs); -void (*read_desc) (struct dm_pool * mem,struct config_tree * cf, +void (*read_desc) (struct dm_pool * mem,const struct config_tree *cf,time_t *when,char **desc);const char *(*read_vgname) (const struct format_type *fmt, -struct config_tree *cft, +const struct config_tree *cft,struct id *vgid,uint64_t *vgstatus,char **creation_host); };
@@ -59,10 +59,10 @@ struct text_vg_version_ops {struct text_vg_version_ops *text_vg_vsn1_init (void );int print_flags (uint64_t status,int type,char *buffer,size_t size); -int read_flags (uint64_t *status,int type,struct config_value *cv); +int read_flags (uint64_t *status,int type,const struct config_value *cv);char *alloc_printed_tags (struct dm_list *tags); -int read_tags (struct dm_pool *mem,struct dm_list *tags,struct config_value *cv); +int read_tags (struct dm_pool *mem,struct dm_list *tags,const struct config_value *cv);int text_vg_export_file (struct volume_group *vg,const char *desc,FILE *fp);int text_vg_export_raw (struct volume_group *vg,const char *desc,char **buf);
lib/format_text/import_vsn1.c +34 -33
199 lines not on this page · raw message
lib/format_text/tags.c +1 -1
@@ -61,7 +61,7 @@ bad: return_NULL; } -int read_tags (struct dm_pool *mem,struct dm_list *tags,struct config_value *cv) +int read_tags (struct dm_pool *mem,struct dm_list *tags,const struct config_value *cv) {if (cv->type ==CFG_EMPTY_ARRAY )return 1 ;
lib/metadata/lv_manip.c +2 -2
@@ -958,8 +958,8 @@ static int _is_same_pv(struct pv_match *pvmatch __attribute((unused)), struct pv*/ static int _has_matching_pv_tag (struct pv_match *pvmatch,struct pv_segment *pvseg,struct pv_area *pva) { -struct config_value *cv; -char *str; +const struct config_value *cv; +const char *str;const char *tag_matched;for (cv = pvmatch->cling_tag_list_cn->v; cv; cv = cv->next) {
lib/metadata/segtype.h +1 -1
@@ -70,7 +70,7 @@ struct segtype_handler {void (*display) (const struct lv_segment * seg);int (*text_export) (const struct lv_segment * seg,struct formatter * f); -int (*text_import_area_count) (struct config_node * sn, +int (*text_import_area_count) (const struct config_node * sn,uint32_t *area_count); int (*text_import) (struct lv_segment * seg, const struct config_node * sn,
lib/mirror/mirrored.c +2 -2
@@ -72,7 +72,7 @@ static void _mirrored_display(const struct lv_segment *seg)log_print (" " ); } -static int _mirrored_text_import_area_count (struct config_node *sn,uint32_t *area_count) +static int _mirrored_text_import_area_count (const struct config_node *sn,uint32_t *area_count) {if (!get_config_uint32 (sn,"mirror_count" , area_count)) { log_error("Couldn't read 'mirror_count' for "
@@ -87,7 +87,7 @@ static int _mirrored_text_import(struct lv_segment *seg, const struct config_nod struct dm_hash_table *pv_hash) {const struct config_node *cn; -char *logname =NULL ; +const char *logname =NULL ;if (find_config_node (sn,"extents_moved" )) { if (get_config_uint32(sn, "extents_moved",
lib/mm/memlock.c +1 -1
@@ -124,7 +124,7 @@ static void _release_memory(void)static int _maps_line (const struct config_node *cn,lvmlock_t lock,const char * line,size_t * mstats) { -struct config_value *cv; +const struct config_value *cv;long from, to;int pos, i;char fr, fw, fx, fp;
lib/replicator/replicator.c +2 -2
@@ -89,7 +89,7 @@ static const char _state_txt[NUM_REPLICATOR_STATE][8] = {static replicator_state_t _get_state (const struct config_node *sn,const char *path,replicator_state_t def) { -char *str; +const char *str;unsigned i;if (get_config_str (sn, path, &str)) {
@@ -118,7 +118,7 @@ static const char _op_mode_txt[NUM_DM_REPLICATOR_MODES][8] = {static dm_replicator_mode_t _get_op_mode (const struct config_node *sn,const char *path,dm_replicator_mode_t def) { -char *str; +const char *str;unsigned i;if (get_config_str (sn, path, &str)) {
lib/striped/striped.c +1 -1
@@ -57,7 +57,7 @@ static void _striped_display(const struct lv_segment *seg)log_print (" " ); } -static int _striped_text_import_area_count (struct config_node *sn,uint32_t *area_count) +static int _striped_text_import_area_count (const struct config_node *sn,uint32_t *area_count) {if (!get_config_uint32 (sn,"stripe_count" , area_count)) { log_error("Couldn't read 'stripe_count' for "
Signature · 1 line
1.7.3.3
PATCH 2/20 Const fixes and additions
In reply to Zdenek Kabelac--- lib/config/config.c | 4 ++-- lib/datastruct/btree.c | 2 +- lib/format_pool/format_pool.c | 2 +- lib/format_text/import.c | 2 +- lib/metadata/metadata.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
lib/config/config.c +2 -2
@@ -239,8 +239,8 @@ int read_config_fd(struct config_tree *cft, struct device *dev, }if (checksum_fn && checksum != - (checksum_fn (checksum_fn (INITIAL_CRC , (uint8_t *)p->fb, size), - (uint8_t *)(p->fb + size), size2))) { + (checksum_fn (checksum_fn (INITIAL_CRC , (const uint8_t *)p->fb, size), + (const uint8_t *)(p->fb + size), size2))) {log_error ("%s: Checksum error" ,dev_name (dev)); goto out; }
lib/datastruct/btree.c +1 -1
@@ -103,7 +103,7 @@ int btree_insert(struct btree *t, uint32_t k, void *data)void *btree_get_data (const struct btree_iter *it) { -return ((struct node *) it)->data; +return ((const struct node *) it)->data; }static struct node *_left (struct node *n)
lib/format_pool/format_pool.c +1 -1
@@ -75,7 +75,7 @@ static struct user_subpool *_build_usp(struct dm_list *pls, struct dm_pool *mem,return usp; } -static int _check_usp (char *vgname,struct user_subpool *usp,int sp_count) +static int _check_usp (const char *vgname,struct user_subpool *usp,int sp_count) {int i;unsigned j;
lib/format_text/import.c +1 -1
@@ -131,7 +131,7 @@ struct volume_group *text_vg_import_file(struct format_instance *fid, when, desc); } -struct volume_group *import_vg_from_buffer (char *buf, +struct volume_group *import_vg_from_buffer (const char *buf,struct format_instance *fid) {struct volume_group *vg =NULL ;
lib/metadata/metadata.h +1 -1
@@ -386,7 +386,7 @@ void lv_calculate_readahead(const struct logical_volume *lv, uint32_t *read_ahea* For internal metadata caching. */ int export_vg_to_buffer (struct volume_group *vg,char **buf); -struct volume_group *import_vg_from_buffer (char *buf, +struct volume_group *import_vg_from_buffer (const char *buf,struct format_instance *fid);/*
Signature · 1 line
1.7.3.3
PATCH 3/20 Use const char* const *
In reply to Zdenek KabelacFix const warning for casting char** to const char*.
--- lib/device/dev-cache.c | 4 ++-- libdm/libdevmapper.h | 2 +- libdm/regex/matcher.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
lib/device/dev-cache.c +2 -2
@@ -543,7 +543,7 @@ static int _init_preferred_names(struct cmd_context *cmd)const struct config_node *cn;const struct config_value *v;struct dm_pool *scratch =NULL ; -char **regex; +const char **regex;unsigned count =0 ;int i, r =0 ;
@@ -583,7 +583,7 @@ static int _init_preferred_names(struct cmd_context *cmd) }if (!(_cache.preferred_names_matcher = -dm_regex_create (_cache.mem,(const char **) regex, count))) { +dm_regex_create (_cache.mem, regex, count))) {log_error ("Preferred device name pattern matcher creation failed." ); goto out; }
libdm/libdevmapper.h +1 -1
@@ -1020,7 +1020,7 @@ struct dm_regex;* Initialise an array of num patterns for matching. * Uses memory from mem. */ -struct dm_regex *dm_regex_create (struct dm_pool *mem,const char **patterns, +struct dm_regex *dm_regex_create (struct dm_pool *mem,const char *const *patterns,unsigned num_patterns);/*
libdm/regex/matcher.c +1 -1
@@ -310,7 +310,7 @@ static void _force_states(struct dm_regex *m) } } -struct dm_regex *dm_regex_create (struct dm_pool *mem,const char **patterns, +struct dm_regex *dm_regex_create (struct dm_pool *mem,const char *const *patterns,unsigned num_patterns) {char *all, *ptr;
Signature · 1 line
1.7.3.3
PATCH 4/20 Remove wrong cast to (char*)
In reply to Zdenek Kabelac--- liblvm/lvm_base.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
liblvm/lvm_base.c +1 -1
@@ -61,7 +61,7 @@ lvm_t lvm_init(const char *system_dir)* archive() call. Possible example: * cmd_line = "lvm_vg_create: vg1\nlvm_vg_extend vg1 /dev/sda1\n" */ - cmd->cmd_line = (char *)"liblvm" ; + cmd->cmd_line ="liblvm" ;return (lvm_t ) cmd; }
Signature · 1 line
1.7.3.3
PATCH 5/20 Remove const from destroy callback
In reply to Zdenek KabelacWe have 2 choices here:
- add dm_free_c(const void*) to accept const pointers for free and make just one const void* -> void* cast there.
- stick with 'standard' way of freeing non-const pointers - i.e when freeing point we usually have the writable structure.
So this patch removes 'const' from destroy() function callbacks.
Note: i.e. in _text_destroy() we even operate on passed const pointer.
2nd note we still have functions which need to free static pointers, so this patch doesn't fix all places - but it's get down to very few occurences.
--- lib/error/errseg.c | 4 ++-- lib/format1/format1.c | 4 ++-- lib/format_pool/format_pool.c | 4 ++-- lib/format_text/format-text.c | 4 ++-- lib/freeseg/freeseg.c | 4 ++-- lib/metadata/metadata.h | 2 +- lib/metadata/segtype.h | 2 +- lib/mirror/mirrored.c | 4 ++-- lib/replicator/replicator.c | 4 ++-- lib/snapshot/snapshot.c | 4 ++-- lib/striped/striped.c | 4 ++-- lib/unknown/unknown.c | 4 ++-- lib/zero/zero.c | 4 ++-- 13 files changed, 24 insertions(+), 24 deletions(-)
lib/error/errseg.c +2 -2
@@ -81,9 +81,9 @@ static int _errseg_modules_needed(struct dm_pool *mem,return 1 ; } -static void _errseg_destroy (const struct segment_type *segtype) +static void _errseg_destroy (struct segment_type *segtype) { -dm_free ((void *)segtype); +dm_free (segtype); }static struct segtype_handler _error_ops = {
lib/format1/format1.c +2 -2
@@ -555,9 +555,9 @@ static void _format1_destroy_instance(struct format_instance *fid __attribute__( { } -static void _format1_destroy (const struct format_type *fmt) +static void _format1_destroy (struct format_type *fmt) { -dm_free ((void *) fmt); +dm_free (fmt); }static struct format_handler _format1_ops = {
lib/format_pool/format_pool.c +2 -2
@@ -286,9 +286,9 @@ static void _pool_destroy_instance(struct format_instance *fid __attribute__((un { } -static void _pool_destroy (const struct format_type *fmt) +static void _pool_destroy (struct format_type *fmt) { -dm_free ((void *) fmt); +dm_free (fmt); }/* *INDENT-OFF* */
lib/format_text/format-text.c +2 -2
@@ -1719,7 +1719,7 @@ static void _free_raws(struct dm_list *raw_list) } } -static void _text_destroy (const struct format_type *fmt) +static void _text_destroy (struct format_type *fmt) {if (fmt->private) {_free_dirs (&((struct mda_lists *) fmt->private)->dirs);
@@ -1727,7 +1727,7 @@ static void _text_destroy(const struct format_type *fmt)dm_free (fmt->private); } -dm_free ((void *)fmt); +dm_free (fmt); }static struct metadata_area_ops _metadata_text_file_ops = {
lib/freeseg/freeseg.c +2 -2
@@ -31,9 +31,9 @@ static const char *_freeseg_name(const struct lv_segment *seg)return seg->segtype->name; } -static void _freeseg_destroy (const struct segment_type *segtype) +static void _freeseg_destroy (struct segment_type *segtype) { -dm_free ((void *)segtype); +dm_free (segtype); }static struct segtype_handler _freeseg_ops = {
lib/metadata/metadata.h +1 -1
@@ -291,7 +291,7 @@ struct format_handler {/* * Destructor for format type */ -void (*destroy) (const struct format_type * fmt); +void (*destroy) (struct format_type * fmt); };/*
lib/metadata/segtype.h +1 -1
@@ -97,7 +97,7 @@ struct segtype_handler {int (*modules_needed) (struct dm_pool *mem,const struct lv_segment *seg,struct dm_list *modules); -void (*destroy) (const struct segment_type * segtype); +void (*destroy) (struct segment_type * segtype);int (*target_monitored) (struct lv_segment *seg,int *pending);int (*target_monitor_events) (struct lv_segment *seg,int events);int (*target_unmonitor_events) (struct lv_segment *seg,int events);
lib/mirror/mirrored.c +2 -2
@@ -600,9 +600,9 @@ static int _mirrored_modules_needed(struct dm_pool *mem,return 1 ; } -static void _mirrored_destroy (const struct segment_type *segtype) +static void _mirrored_destroy (struct segment_type *segtype) { -dm_free ((void *) segtype); +dm_free (segtype); }static struct segtype_handler _mirrored_ops = {
lib/replicator/replicator.c +2 -2
@@ -406,9 +406,9 @@ static int _replicator_modules_needed(struct dm_pool *mem,return 1 ; } -static void _replicator_destroy (const struct segment_type *segtype) +static void _replicator_destroy (struct segment_type *segtype) { -dm_free ((void *)segtype); +dm_free (segtype); }static struct segtype_handler _replicator_ops = {
lib/snapshot/snapshot.c +2 -2
@@ -218,9 +218,9 @@ static int _snap_modules_needed(struct dm_pool *mem,return 1 ; } -static void _snap_destroy (const struct segment_type *segtype) +static void _snap_destroy (struct segment_type *segtype) { -dm_free ((void *)segtype); +dm_free (segtype); }static struct segtype_handler _snapshot_ops = {
lib/striped/striped.c +2 -2
@@ -199,9 +199,9 @@ static int _striped_target_present(struct cmd_context *cmd, }#endif -static void _striped_destroy (const struct segment_type *segtype) +static void _striped_destroy (struct segment_type *segtype) { -dm_free ((void *)segtype); +dm_free (segtype); }static struct segtype_handler _striped_ops = {
lib/unknown/unknown.c +2 -2
@@ -74,9 +74,9 @@ static int _unknown_add_target_line(struct dev_manager *dm __attribute__((unused }#endif -static void _unknown_destroy (const struct segment_type *segtype) +static void _unknown_destroy (struct segment_type *segtype) { -dm_free ((void *)segtype); +dm_free (segtype); }static struct segtype_handler _unknown_ops = {
lib/zero/zero.c +2 -2
@@ -78,9 +78,9 @@ static int _zero_modules_needed(struct dm_pool *mem,return 1 ; } -static void _zero_destroy (const struct segment_type *segtype) +static void _zero_destroy (struct segment_type *segtype) { -dm_free ((void *) segtype); +dm_free (segtype); }static struct segtype_handler _zero_ops = {
Signature · 1 line
1.7.3.3
PATCH 6/20 Replace void* arithmetic with char*
In reply to Zdenek Kabelac--- lib/activate/activate.c | 2 +- tools/dmsetup.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
lib/activate/activate.c +1 -1
@@ -399,7 +399,7 @@ int target_version(const char *target_name, uint32_t *maj, goto out; } - target = (void *) target + target->next; + target = (struct dm_versions *)((char *) target + target->next); }while (last_target != target); out:
tools/dmsetup.c +3 -3
@@ -1288,8 +1288,8 @@ static int _process_all(int argc, char **argv, int silent, }do { - names = (void *) names + next; -if (!fn (argc, argv, (void *) names)) + names = (struct dm_names *)((char *) names + next); +if (!fn (argc, argv, names)) r =0 ; next = names->next; }while (next);
@@ -1632,7 +1632,7 @@ static int _targets(int argc __attribute__((unused)), char **argv __attribute__(printf ("%-16s v%d.%d.%d\n" , target->name, target->version[0 ], target->version[1 ], target->version[2 ]); - target = (void *) target + target->next; + target = (struct dm_versions *)((char *) target + target->next); }while (last_target != target); r =1 ;
Signature · 1 line
1.7.3.3
PATCH 7/20 Use const char * arithmetic for offset calculation
In reply to Zdenek KabelacAs 'const' types are also passed to this macro - lets keep offset calculation with const char *. Cleans several gcc constness warnings.
--- libdm/libdevmapper.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
libdm/libdevmapper.h +1 -1
@@ -814,7 +814,7 @@ struct dm_list *dm_list_next(const struct dm_list *head, const struct dm_list *e* contained in a structure of type t, return the containing structure. */ #define dm_list_struct_base (v, t, head) \ - ((t *)((char*)(v) - (char*)&((t *) 0)->head)) + ((t *)((const char *)(v) - (const char *)&((t *) 0)->head))/* * Given the address v of an instance of 'struct dm_list list' contained in
Signature · 1 line
1.7.3.3
PATCH 8/20 Use const char * for name and old_name in vg
In reply to Zdenek KabelacTurn pointers to const char - to avoid changes of these struct members. (Having better control over, were the members could be modified).
Idea for future: system_id should be probably char[NAME_LEN]
--- lib/metadata/vg.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
lib/metadata/vg.h +2 -2
@@ -43,8 +43,8 @@ struct volume_group {uint64_t status;struct id id; -char *name; -char *old_name;/* Set during vgrename and vgcfgrestore */ +const char *name; +const char *old_name;/* Set during vgrename and vgcfgrestore */ char *system_id;uint32_t extent_size;
Signature · 1 line
1.7.3.3
PATCH 9/20 Replace stack trace with failure exit path
In reply to Zdenek KabelacWARNING: functional change!
It looks like bug - an error return should be here
- but the code currently ignores fail in engine construction
- is there any use of rfilter without engine ?
--- lib/filters/filter-regex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
lib/filters/filter-regex.c +1 -1
@@ -137,7 +137,7 @@ static int _build_matcher(struct rfilter *rf, const struct config_value *val)*/ if (!(rf->engine =dm_regex_create (rf->mem, (const char **) regex, count))) - stack; + goto_out; r =1 ; out:
Signature · 1 line
1.7.3.3
PATCH 10/20 Simplify usage fprintf clvmd
In reply to Zdenek KabelacUse one fprintf for usage print.
Use const char* for prog parameter.
--- daemons/clvmd/clvmd.c | 41 ++++++++++++++++++++--------------------- 1 files changed, 20 insertions(+), 21 deletions(-)
daemons/clvmd/clvmd.c +20 -21
@@ -143,38 +143,37 @@ static void add_reply_to_list(struct local_client *client, int status,static if_type_t parse_cluster_interface (char *ifname);static if_type_t get_cluster_type (void ); -static void usage (char *prog,FILE *file) +static void usage (const char *prog,FILE *file) { -fprintf (file,"Usage:\n" ); -fprintf (file,"%s [Vhd]\n" , prog); -fprintf (file,"\n" ); -fprintf (file," -V Show version of clvmd\n" ); -fprintf (file," -h Show this help information\n" ); -fprintf (file," -d Set debug level\n" ); -fprintf (file," If starting clvmd then don't fork, run in the foreground\n" ); -fprintf (file," -R Tell all running clvmds in the cluster to reload their device cache\n" ); -fprintf (file," -S Restart clvmd, preserving exclusive locks\n" ); -fprintf (file," -C Sets debug level (from -d) on all clvmd instances clusterwide\n" ); -fprintf (file," -t<secs> Command timeout (default 60 seconds)\n" ); -fprintf (file," -T<secs> Startup timeout (default none)\n" ); -fprintf (file," -I<cmgr> Cluster manager (default: auto)\n" ); -fprintf (file," Available cluster managers: " ); +fprintf (file,"Usage:\n" +"%s [Vhd]\n\n" +" -V Show version of clvmd\n" +" -h Show this help information\n" +" -d Set debug level\n" +" If starting clvmd then don't fork, run in the foreground\n" +" -R Tell all running clvmds in the cluster to reload their device cache\n" +" -S Restart clvmd, preserving exclusive locks\n" +" -C Sets debug level (from -d) on all clvmd instances clusterwide\n" +" -t<secs> Command timeout (default 60 seconds)\n" +" -T<secs> Startup timeout (default none)\n" +" -I<cmgr> Cluster manager (default: auto)\n" +" Available cluster managers: " #ifdef USE_COROSYNC -fprintf (file,"corosync " ); +"corosync " #endif #ifdef USE_CMAN -fprintf (file,"cman " ); + "cman " #endif #ifdef USE_OPENAIS -fprintf (file,"openais " ); + "openais " #endif #ifdef USE_GULM -fprintf (file,"gulm " ); + "gulm " #endif #ifdef USE_SINGLENODE -fprintf (file,"singlenode" ); + "singlenode " #endif -fprintf (file,"\n" ); + "\n", prog); }/* Called to signal the parent how well we got on during initialisation */
Signature · 1 line
1.7.3.3
PATCH 11/20 Add test for 'read' result
In reply to Zdenek KabelacRead result should not be ignored.
Add some small check even when there is very low probability to fail in this place.
FIXME Generic read routine should be used.
--- tools/lvmcmdline.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-)
tools/lvmcmdline.c +10 -6
@@ -1191,15 +1191,19 @@ static const char *_get_cmdline(pid_t pid) {static char _proc_cmdline[32 ];char buf[256 ]; -int fd; +int fd, n =0 ;snprintf (buf,sizeof (buf),DEFAULT_PROC_DIR "/%u/cmdline" , pid); +/* FIXME Use generic read code. */ if ((fd =open (buf,O_RDONLY )) >0 ) { -read (fd, _proc_cmdline,sizeof (_proc_cmdline) -1 ); - _proc_cmdline[sizeof (_proc_cmdline) -1 ] ='\0' ; -close (fd); - }else - _proc_cmdline[0 ] ='\0' ; +if ((n =read (fd, _proc_cmdline,sizeof (_proc_cmdline) -1 )) <0 ) { +log_sys_error ("read" , buf); + n =0 ; + } +if (close (fd)) +log_sys_error ("close" , buf); + } + _proc_cmdline[n] ='\0' ;return _proc_cmdline; }
Signature · 1 line
1.7.3.3
PATCH 12/20 Add test for allocation results for node clonning
In reply to Zdenek KabelacAdd checks for clonning allocation a fail-out when something is not allocated correctly.
Also move var declaration at begining of function.
--- lib/config/config.c | 47 ++++++++++++++++++++++++++++++----------------- 1 files changed, 30 insertions(+), 17 deletions(-)
lib/config/config.c +30 -17
@@ -1330,30 +1330,43 @@ unsigned maybe_config_section(const char *str, unsigned len)static struct config_value *_clone_config_value (struct dm_pool *mem,const struct config_value *v) { +struct config_value *new_cv; +if (!v)return NULL ; -struct config_value *new =_create_value (mem); - new->type = v->type; -if (v->type ==CFG_STRING ) - new->v.str =dm_pool_strdup (mem, v->v.str); -else - new->v = v->v; - new->next =_clone_config_value (mem, v->next); -return new; + +if (!(new_cv =_create_value (mem))) + return_NULL; + + new_cv->type = v->type; +if (v->type ==CFG_STRING ) { +if (!(new_cv->v.str =dm_pool_strdup (mem, v->v.str))) + return_NULL; + }else + new_cv->v = v->v; + +if (v->next && !(new_cv->next =_clone_config_value (mem, v->next))) + return_NULL; + +return new_cv; }struct config_node *clone_config_node (struct dm_pool *mem,const struct config_node *cn,int siblings) { +struct config_node *new_cn; +if (!cn)return NULL ; -struct config_node *new =_create_node (mem); - new->key =dm_pool_strdup (mem, cn->key); - new->child =clone_config_node (mem, cn->child,1 ); - new->v =_clone_config_value (mem, cn->v); -if (siblings) - new->sib =clone_config_node (mem, cn->sib, siblings); -else - new->sib =NULL ; -return new; + +if (!(new_cn =_create_node (mem))) + return_NULL; + +if ((cn->key && !(new_cn->key =dm_pool_strdup (mem, cn->key))) || + (cn->child && !(new_cn->child =clone_config_node (mem, cn->child,1 ))) || + (cn->v && !(new_cn->v =_clone_config_value (mem, cn->v))) || + (siblings && cn->sib && !(new_cn->sib =clone_config_node (mem, cn->sib, siblings)))) + return_NULL;/* 'new_cn' released with mem pool */ + +return new_cn; }
Signature · 1 line
1.7.3.3
PATCH 13/20 Properly use dm_free
In reply to Zdenek KabelacUse dm_zalloc to obtain zeroed memory block.
Use dm_free for dm_ allocated memory blocks.
Test close() for error.
--- daemons/cmirrord/functions.c | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-)
daemons/cmirrord/functions.c +12 -15
@@ -429,13 +429,12 @@ static int _clog_ctr(char *uuid, uint64_t luid, block_on_error =1 ; } - lc =malloc (sizeof (*lc)); + lc =dm_zalloc (sizeof (*lc));if (!lc) {LOG_ERROR ("Unable to allocate cluster log context" ); r = -ENOMEM ; goto fail; } -memset (lc,0 ,sizeof (*lc)); lc->region_size = region_size; lc->region_count = region_count;
@@ -453,7 +452,7 @@ static int _clog_ctr(char *uuid, uint64_t luid, (duplicate = get_pending_log(lc->uuid, lc->luid))) {LOG_ERROR ("[%s/%" PRIu64"u] Log already exists, unable to create." ,SHORT_UUID (lc->uuid), lc->luid); -free (lc); +dm_free (lc);return -EINVAL ; }
@@ -511,15 +510,13 @@ static int _clog_ctr(char *uuid, uint64_t luid,return 0 ; fail:if (lc) { -if (lc->clean_bits) -free (lc->clean_bits); -if (lc->sync_bits) -free (lc->sync_bits); -if (lc->disk_buffer) -free (lc->disk_buffer); -if (lc->disk_fd >=0 ) -close (lc->disk_fd); -free (lc); +if (lc->disk_fd >=0 &&close (lc->disk_fd)) +LOG_ERROR ("Close device error, %s: %s" , + disk_path,strerror (errno)); +free (lc->disk_buffer); +dm_free (lc->sync_bits); +dm_free (lc->clean_bits); +dm_free (lc); }return r; }
@@ -634,9 +631,9 @@ static int clog_dtr(struct dm_ulog_request *rq)close (lc->disk_fd);if (lc->disk_buffer)free (lc->disk_buffer); -free (lc->clean_bits); -free (lc->sync_bits); -free (lc); +dm_free (lc->clean_bits); +dm_free (lc->sync_bits); +dm_free (lc);return 0 ; }
Signature · 1 line
1.7.3.3
PATCH 14/20 Remove dead store in _clog_ctr
In reply to Zdenek KabelacRemove unused 'duplicate' pointer.
--- daemons/cmirrord/functions.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
daemons/cmirrord/functions.c +2 -3
@@ -366,7 +366,6 @@ static int _clog_ctr(char *uuid, uint64_t luid,uint64_t region_size;uint64_t region_count;struct log_c *lc =NULL ; -struct log_c *duplicate;enum sync log_sync =DEFAULTSYNC ;uint32_t block_on_error =0 ;
@@ -448,8 +447,8 @@ static int _clog_ctr(char *uuid, uint64_t luid,strncpy (lc->uuid, uuid,DM_UUID_LEN ); lc->luid = luid; -if ((duplicate =get_log (lc->uuid, lc->luid)) || - (duplicate =get_pending_log (lc->uuid, lc->luid))) { +if (get_log (lc->uuid, lc->luid) || +get_pending_log (lc->uuid, lc->luid)) {LOG_ERROR ("[%s/%" PRIu64"u] Log already exists, unable to create." ,SHORT_UUID (lc->uuid), lc->luid);dm_free (lc);
Signature · 1 line
1.7.3.3
PATCH 15/20 Remove dead assignment in _init_logging
In reply to Zdenek Kabelacold_mask is not used later - so remove it.
--- lib/commands/toolcontext.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
lib/commands/toolcontext.c +1 -2
@@ -200,7 +200,6 @@ static void _init_logging(struct cmd_context *cmd)static int _process_config (struct cmd_context *cmd) { -mode_t old_umask;const char *read_ahead;struct stat st;const struct config_node *cn;
@@ -211,7 +210,7 @@ static int _process_config(struct cmd_context *cmd)"global/umask" , DEFAULT_UMASK); -if ((old_umask =umask ((mode_t ) cmd->default_settings.umask)) != +if (umask ((mode_t ) cmd->default_settings.umask) != (mode_t ) cmd->default_settings.umask)log_verbose ("Set umask to %04o" , cmd->default_settings.umask);
Signature · 1 line
1.7.3.3
PATCH 16/20 Remove dead store in lvm_run_command
In reply to Zdenek Kabelac'ret' is not read before its next assignment.
--- tools/lvmcmdline.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
tools/lvmcmdline.c +2 -2
@@ -1064,8 +1064,8 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)set_cmd_name (cmd->command->name);if (arg_count (cmd, config_ARG)) -if ((ret =override_config_tree_from_string (cmd, -arg_str_value (cmd, config_ARG,"" )))) { +if (override_config_tree_from_string (cmd, +arg_str_value (cmd, config_ARG,"" ))) { ret =EINVALID_CMD_LINE ; goto_out; }
Signature · 1 line
1.7.3.3
PATCH 17/20 Remove dead assignment in dev_manager_transient
In reply to Zdenek Kabelac'segh' is never read after this assignment - remove it.
--- lib/activate/dev_manager.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
lib/activate/dev_manager.c +1 -1
@@ -620,7 +620,7 @@ int dev_manager_transient(struct dev_manager *dm, struct logical_volume *lv) }while (next); -if ((segh =dm_list_next (&lv->segments, segh))) { +if (dm_list_next (&lv->segments, segh)) {log_error ("Number of segments in active LV %s does not " "match metadata" , lv->name); goto out;
Signature · 1 line
1.7.3.3
PATCH 18/20 Remove dead assignment in _remove
In reply to Zdenek Kabelac'r' is not read - remove it.
--- tools/dmsetup.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
tools/dmsetup.c +1 -3
@@ -1386,10 +1386,8 @@ error:static int _remove (int argc,char **argv,void *data __attribute__((unused))) { -int r; -if (_switches[FORCE_ARG ] && argc >1 ) - r =_error_device (argc, argv,NULL ); +_error_device (argc, argv,NULL );return _simple (DM_DEVICE_REMOVE , argc >1 ? argv[1 ] :NULL ,0 ,0 ); }
Signature · 1 line
1.7.3.3
PATCH 19/20 Remove unused dev_dir_provided
In reply to Zdenek Kabelac'dev_dir_provided' is unused - remove it.
--- tools/toollib.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
tools/toollib.c +0 -2
@@ -842,7 +842,6 @@ const char *extract_vgname(struct cmd_context *cmd, const char *lv_name)const char *vg_name = lv_name;char *st;char *dev_dir = cmd->dev_dir; -int dev_dir_provided =0 ;/* Path supplied? */ if (vg_name &&strchr (vg_name,'/' )) {
@@ -854,7 +853,6 @@ const char *extract_vgname(struct cmd_context *cmd, const char *lv_name) }if (!strncmp (vg_name, dev_dir,strlen (dev_dir))) { vg_name +=strlen (dev_dir); - dev_dir_provided =1 ;while (*vg_name =='/' ) vg_name++; }
Signature · 1 line
1.7.3.3
PATCH 20/20 Add internal error if pointer is uninitialized
In reply to Zdenek KabelacAdd simple check for existance of 'pl'.
--- lib/format_pool/disk_rep.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
lib/format_pool/disk_rep.c +5 -0
@@ -263,6 +263,11 @@ static int _read_vg_pds(const struct format_type *fmt, struct dm_pool *mem,*/ if (!sp_count) { /* FIXME pl left uninitialised if !info->dev */ + if (!pl) { + log_error(INTERNAL_ERROR "device is missing"); + dm_pool_destroy(tmpmem); + return 0; + } sp_count = pl->pd.pl_subpools; if (!(sp_devs = dm_pool_zalloc(tmpmem,
Signature · 1 line
1.7.3.3