cleanup: rename 'invisible devices' to 'hidden devices'

diff --git a/WHATS_NEW b/WHATS_NEW
index fb485b3b4b7f08ffaf7d63c522f886dde092ac8c..aff000fa92ff6cd08c0e2ecf4a4a885e84c96ce9 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,7 +1,7 @@
 Version 2.02.140 -
 ===================================
-  Add report/mark_invisible_devices to lvm.conf.
-  Use brackets consistently in report fields to mark invisible devices.
+  Add report/mark_hidden_devices to lvm.conf.
+  Use brackets consistently in report fields to mark hidden devices.
   Restore background polling processing during auto-activation (2.02.119).
   Fix invalid memory read when reporting cache LV policy_name (2.02.126).
 

diff --git a/conf/example.conf.in b/conf/example.conf.in
index f549f15f4315810b2f26034a49fa1989f875180d..e567a73564e94f070c409cd4df789dcaa5bd35d2 100644 (file)
--- a/conf/example.conf.in
+++ b/conf/example.conf.in
@@ -1809,10 +1809,10 @@ activation {
        # This configuration option has an automatic default value.
        # pvsegs_cols_verbose = "pv_name,vg_name,pv_fmt,pv_attr,pv_size,pv_free,pvseg_start,pvseg_size,lv_name,seg_start_pe,segtype,seg_pe_ranges"
 
-       # Configuration option report/mark_invisible_devices.
-       # Use brackets [] to mark invisible devices.
+       # Configuration option report/mark_hidden_devices.
+       # Use brackets [] to mark hidden devices.
        # This configuration option has an automatic default value.
-       # mark_invisible_devices = 1
+       # mark_hidden_devices = 1
 # }
 
 # Configuration section dmeventd.

diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c
index a8bf187ab01aaec7950963345ba60faddd0fcdf5..6163bdc1f079721929950cdac4dff39a16677274 100644 (file)
--- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
@@ -478,7 +478,7 @@ int process_profilable_config(struct cmd_context *cmd)
 
        cmd->si_unit_consistency = find_config_tree_bool(cmd, global_si_unit_consistency_CFG, NULL);
        cmd->report_binary_values_as_numeric = find_config_tree_bool(cmd, report_binary_values_as_numeric_CFG, NULL);
-       cmd->report_mark_invisible_devices = find_config_tree_bool(cmd, report_mark_invisible_devices_CFG, NULL);
+       cmd->report_mark_hidden_devices = find_config_tree_bool(cmd, report_mark_hidden_devices_CFG, NULL);
        cmd->default_settings.suffix = find_config_tree_bool(cmd, global_suffix_CFG, NULL);
        cmd->report_list_item_separator = find_config_tree_str(cmd, report_list_item_separator_CFG, NULL);
        if (!(cmd->time_format = _set_time_format(cmd)))

diff --git a/lib/commands/toolcontext.h b/lib/commands/toolcontext.h
index 5a7b3afeafd2082f86fc7349224d12b954a45a61..b2033fcc3cd58afac74ace9c096b007d07955455 100644 (file)
--- a/lib/commands/toolcontext.h
+++ b/lib/commands/toolcontext.h
@@ -121,7 +121,7 @@ struct cmd_context {
        unsigned auto_set_activation_skip:1;
        unsigned si_unit_consistency:1;
        unsigned report_binary_values_as_numeric:1;
-       unsigned report_mark_invisible_devices:1;
+       unsigned report_mark_hidden_devices:1;
        unsigned metadata_read_only:1;
        unsigned ignore_clustered_vgs:1;
        unsigned threaded:1;                    /* set if running within a thread e.g. clvmd */

diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h
index bb5d7d989b4d989dcbca30ced50b8cd234bd0e48..60b511076e46d2327f158b607a1e20e923b6dcaa 100644 (file)
--- a/lib/config/config_settings.h
+++ b/lib/config/config_settings.h
@@ -1671,8 +1671,8 @@ cfg(report_pvsegs_cols_verbose_CFG, "pvsegs_cols_verbose", report_CFG_SECTION, C
        "List of columns to sort by when reporting 'pvs --segments' command in verbose mode.\n"
        "See 'pvs --segments -o help' for the list of possible fields.\n")
 
-cfg(report_mark_invisible_devices_CFG, "mark_invisible_devices", report_CFG_SECTION, CFG_PROFILABLE | CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, 1, vsn(2, 2, 140), NULL, 0, NULL,
-       "Use brackets [] to mark invisible devices.\n")
+cfg(report_mark_hidden_devices_CFG, "mark_hidden_devices", report_CFG_SECTION, CFG_PROFILABLE | CFG_DEFAULT_COMMENTED, CFG_TYPE_BOOL, 1, vsn(2, 2, 140), NULL, 0, NULL,
+       "Use brackets [] to mark hidden devices.\n")
 
 cfg(dmeventd_mirror_library_CFG, "mirror_library", dmeventd_CFG_SECTION, 0, CFG_TYPE_STRING, DEFAULT_DMEVENTD_MIRROR_LIB, vsn(1, 2, 3), NULL, 0, NULL,
        "The library dmeventd uses when monitoring a mirror device.\n"

diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c
index 44db4df81bd2297c5b6967de67a6e4f2f2b47361..96f6f5c2e6ad243d7d3573b9c0438c88384f92e8 100644 (file)
--- a/lib/metadata/lv.c
+++ b/lib/metadata/lv.c
@@ -30,7 +30,7 @@ static int _utsinit = 0;
 
 static char *_format_pvsegs(struct dm_pool *mem, const struct lv_segment *seg,
                            int range_format, int metadata_areas_only,
-                           int mark_invisible)
+                           int mark_hidden)
 {
        static const char pool_grow_object_failed_msg[] = "dm_pool_grow_object failed";
        unsigned int s;
@@ -72,7 +72,7 @@ static char *_format_pvsegs(struct dm_pool *mem, const struct lv_segment *seg,
                        return NULL;
                }
 
-               if (!visible && mark_invisible && !dm_pool_grow_object(mem, "[", 1)) {
+               if (!visible && mark_hidden && !dm_pool_grow_object(mem, "[", 1)) {
                        log_error(pool_grow_object_failed_msg);
                        return NULL;
                }
@@ -82,7 +82,7 @@ static char *_format_pvsegs(struct dm_pool *mem, const struct lv_segment *seg,
                        return NULL;
                }
 
-               if (!visible && mark_invisible && !dm_pool_grow_object(mem, "]", 1)) {
+               if (!visible && mark_hidden && !dm_pool_grow_object(mem, "]", 1)) {
                        log_error(pool_grow_object_failed_msg);
                        return NULL;
                }
@@ -129,22 +129,22 @@ out:
 
 char *lvseg_devices(struct dm_pool *mem, const struct lv_segment *seg)
 {
-       return _format_pvsegs(mem, seg, 0, 0, seg->lv->vg->cmd->report_mark_invisible_devices);
+       return _format_pvsegs(mem, seg, 0, 0, seg->lv->vg->cmd->report_mark_hidden_devices);
 }
 
 char *lvseg_metadata_devices(struct dm_pool *mem, const struct lv_segment *seg)
 {
-       return _format_pvsegs(mem, seg, 0, 1, seg->lv->vg->cmd->report_mark_invisible_devices);
+       return _format_pvsegs(mem, seg, 0, 1, seg->lv->vg->cmd->report_mark_hidden_devices);
 }
 
 char *lvseg_seg_pe_ranges(struct dm_pool *mem, const struct lv_segment *seg)
 {
-       return _format_pvsegs(mem, seg, 1, 0, seg->lv->vg->cmd->report_mark_invisible_devices);
+       return _format_pvsegs(mem, seg, 1, 0, seg->lv->vg->cmd->report_mark_hidden_devices);
 }
 
 char *lvseg_seg_metadata_le_ranges(struct dm_pool *mem, const struct lv_segment *seg)
 {
-       return _format_pvsegs(mem, seg, 1, 1, seg->lv->vg->cmd->report_mark_invisible_devices);
+       return _format_pvsegs(mem, seg, 1, 1, seg->lv->vg->cmd->report_mark_hidden_devices);
 }
 
 char *lvseg_tags_dup(const struct lv_segment *seg)

diff --git a/lib/report/report.c b/lib/report/report.c
index 3c73a2fbaec9e894218f33a2d453e5763a55aa21..40fcdd887f31592f6fe2c141b6f60f09b0cbda5c 100644 (file)
--- a/lib/report/report.c
+++ b/lib/report/report.c
@@ -1586,7 +1586,7 @@ static int _lvname_disp(struct dm_report *rh, struct dm_pool *mem,
        char *repstr, *lvname;
        size_t len;
 
-       if (lv_is_visible(lv) || !cmd->report_mark_invisible_devices)
+       if (lv_is_visible(lv) || !cmd->report_mark_hidden_devices)
                return _string_disp(rh, mem, field, &lv->name, private);
 
        len = strlen(lv->name) + 3;

diff --git a/test/shell/report-invisible.sh b/test/shell/report-hidden.sh
similarity index 91%
rename from test/shell/report-invisible.sh
rename to test/shell/report-hidden.sh
index d906c9747c1de44a30eb6b3a919dec6b877e1762..ff33df5cdf60a5ab7d2fa51d14ec66e20108fd59 100644 (file)
--- a/test/shell/report-invisible.sh
+++ b/test/shell/report-hidden.sh
@@ -20,7 +20,7 @@ lvcreate --type mirror -m1 -l1 --alloc anywhere -n $lv1 $vg
 
 aux lvmconf 'log/prefix=""'
 
-aux lvmconf "report/mark_invisible_devices = 0"
+aux lvmconf "report/mark_hidden_devices = 0"
 lvs --noheadings -a -o name $vg > out
 grep "^${lv1}_mimage_0" out
 not grep "^\[${lv1}_mimage_0\]" out
@@ -28,7 +28,7 @@ lvs --noheadings -a -o devices $vg/$lv1 > out
 grep "^${lv1}_mimage_0" out
 not grep "^\[${lv1}_mimage_0\]" out
 
-aux lvmconf "report/mark_invisible_devices = 1"
+aux lvmconf "report/mark_hidden_devices = 1"
 lvs --noheadings -a -o name $vg > out
 grep "^\[${lv1}_mimage_0\]" out
 not grep "^${lv1}_mimage_0" out