shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

pvscan: filter does not need to be checked for symlink names

Browse Source 
With the recent use of DEVLINKS, there is no longer any real
point in checking the filter for symlink names.  Removing
this check should not change behavior with or without symlinks
in the filter.
This commit is contained in:
David Teigland 2023-02-15 10:08:25 -06:00
parent 07cd341bd8
commit bd05318ba2
4 changed files with 2 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lib/filters/filter-regex.c
View File

@ -253,48 +253,3 @@ struct dev_filter *regex_filter_create(const struct dm_config_value *patterns, i
dm_pool_destroy(mem);
return NULL;
}
static int _filter_contains_symlink(struct cmd_context *cmd, int filter_cfg)
{
const struct dm_config_node *cn;
const struct dm_config_value *cv;
const char *fname;
if ((cn = find_config_tree_array(cmd, filter_cfg, NULL))) {
for (cv = cn->v; cv; cv = cv->next) {
if (cv->type != DM_CFG_STRING)
continue;
if (!cv->v.str)
continue;
fname = cv->v.str;
if (fname[0] != 'a')
continue;
if (strstr(fname, "/dev/disk/"))
return 1;
if (strstr(fname, "/dev/mapper/"))
return 1;
/* In case /dev/disk/by was omitted */
if (strstr(fname, "lvm-pv-uuid"))
return 1;
if (strstr(fname, "dm-uuid"))
return 1;
if (strstr(fname, "wwn-"))
return 1;
if (strstr(fname, "pci-"))
return 1;
}
}
return 0;
}
int regex_filter_contains_symlink(struct cmd_context *cmd)
{
return _filter_contains_symlink(cmd, devices_filter_CFG) ||
_filter_contains_symlink(cmd, devices_global_filter_CFG);
}

2
lib/filters/filter.h
View File

@ -64,6 +64,4 @@ struct dev_filter *usable_filter_create(struct cmd_context *cmd, struct dev_type
#define DEV_FILTERED_DEVICES_LIST 0x00001000
#define DEV_FILTERED_IS_LV 0x00002000
int regex_filter_contains_symlink(struct cmd_context *cmd);
#endif /* _LVM_FILTER_H */

5
lib/label/label.c
View File

@ -1109,10 +1109,7 @@ int label_scan_vg_online(struct cmd_context *cmd, const char *vgname,
* filter. We get devs from the pvs_online files, so we inherit the
* regex filtering from pvscan and don't have to do it ourself.
*/
if (!cmd->enable_devices_file &&
!cmd->enable_devices_list &&
regex_filter_contains_symlink(cmd))
cmd->filter_regex_skip = 1;
cmd->filter_regex_skip = 1;
cmd->filter_nodata_only = 1;

3
tools/pvscan.c
View File

@ -1502,8 +1502,7 @@ static int _pvscan_cache_args(struct cmd_context *cmd, int argc, char **argv,
*/
if ((dm_list_size(&pvscan_devs) == 1) &&
!cmd->enable_devices_file &&
!cmd->enable_devices_list &&
regex_filter_contains_symlink(cmd)) {
!cmd->enable_devices_list) {
char *env_str;
struct dm_list *env_aliases;
devl = dm_list_item(dm_list_first(&pvscan_devs), struct device_list);