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

filters: sysfs use device_id_sysfs_dir

Browse Source 
This is mainly useful in internal testing - but keep sysfs dir also
passed to filter.
Also drop use of static variable within sysfs filter and base whole
config at creation time.
This commit is contained in:
Zdenek Kabelac 2023-10-03 18:39:39 +02:00
parent 0e8c631f5e
commit cf46f4baee
3 changed files with 31 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/commands/toolcontext.c
View File

@ -1229,7 +1229,7 @@ static struct dev_filter *_init_filter_chain(struct cmd_context *cmd)
* (currently not used for devs match to device id using syfs) * (currently not used for devs match to device id using syfs)
*/ */
if (find_config_tree_bool(cmd, devices_sysfs_scan_CFG, NULL)) { if (find_config_tree_bool(cmd, devices_sysfs_scan_CFG, NULL)) {
if ((filters[nr_filt] = sysfs_filter_create())) if ((filters[nr_filt] = sysfs_filter_create(cmd->device_id_sysfs_dir ?: dm_sysfs_dir())))
nr_filt++; nr_filt++;
} }

46
lib/filters/filter-sysfs.c
View File

@ -15,19 +15,14 @@
#include "lib/misc/lib.h" #include "lib/misc/lib.h"
#include "lib/filters/filter.h" #include "lib/filters/filter.h"
static int _sys_dev_block_found;
#ifdef __linux__ #ifdef __linux__
static int _accept_p(struct cmd_context *cmd, struct dev_filter *f, struct device *dev, const char *use_filter_name) static int _accept_p(struct cmd_context *cmd, struct dev_filter *f, struct device *dev, const char *use_filter_name)
{ {
char path[PATH_MAX]; char path[PATH_MAX];
const char *sysfs_dir; const char *sysfs_dir = f->private;
struct stat info; struct stat info;
if (!_sys_dev_block_found)
return 1;
dev->filtered_flags &= ~DEV_FILTERED_SYSFS; dev->filtered_flags &= ~DEV_FILTERED_SYSFS;
/* /*
@ -37,8 +32,6 @@ static int _accept_p(struct cmd_context *cmd, struct dev_filter *f, struct devic
if (dev->id && dev->id->idtype && (dev->id->idtype != DEV_ID_TYPE_DEVNAME)) if (dev->id && dev->id->idtype && (dev->id->idtype != DEV_ID_TYPE_DEVNAME))
return 1; return 1;
sysfs_dir = dm_sysfs_dir();
if (sysfs_dir && *sysfs_dir) {
if (dm_snprintf(path, sizeof(path), "%sdev/block/%d:%d", if (dm_snprintf(path, sizeof(path), "%sdev/block/%d:%d",
sysfs_dir, (int)MAJOR(dev->dev), (int)MINOR(dev->dev)) < 0) { sysfs_dir, (int)MAJOR(dev->dev), (int)MINOR(dev->dev)) < 0) {
log_debug("failed to create sysfs path"); log_debug("failed to create sysfs path");
@ -50,7 +43,6 @@ static int _accept_p(struct cmd_context *cmd, struct dev_filter *f, struct devic
dev->filtered_flags |= DEV_FILTERED_SYSFS; dev->filtered_flags |= DEV_FILTERED_SYSFS;
return 0; return 0;
} }
}
return 1; return 1;
} }
@ -62,53 +54,51 @@ static void _destroy(struct dev_filter *f)
free(f); free(f);
} }
static void _check_sys_dev_block(void) static int _check_sys_dev_block(const char *sysfs_dir)
{ {
char path[PATH_MAX]; char path[PATH_MAX];
const char *sysfs_dir;
struct stat info; struct stat info;
sysfs_dir = dm_sysfs_dir();
if (sysfs_dir && *sysfs_dir) {
if (dm_snprintf(path, sizeof(path), "%sdev/block", sysfs_dir) < 0) if (dm_snprintf(path, sizeof(path), "%sdev/block", sysfs_dir) < 0)
return; return_0;
if (lstat(path, &info)) { if (lstat(path, &info)) {
log_debug("filter-sysfs disabled: /sys/dev/block not found"); log_debug("filter-sysfs disabled: /sys/dev/block not found");
_sys_dev_block_found = 0; return 0;
} else {
_sys_dev_block_found = 1;
}
}
} }
struct dev_filter *sysfs_filter_create(void) return 1;
}
struct dev_filter *sysfs_filter_create(const char *sysfs_dir)
{ {
const char *sysfs_dir = dm_sysfs_dir();
struct dev_filter *f; struct dev_filter *f;
size_t len;
if (!*sysfs_dir) { if (!sysfs_dir || *sysfs_dir) {
log_verbose("No proc filesystem found: skipping sysfs filter"); log_verbose("No proc filesystem found: skipping sysfs filter");
return NULL; return NULL;
} }
/* support old kernels that don't have this */ /* support old kernels that don't have this */
_check_sys_dev_block(); if (!_check_sys_dev_block(sysfs_dir))
return NULL;
if (!(f = zalloc(sizeof(*f)))) len = strlen(sysfs_dir) + 1;
goto_bad; if (!(f = zalloc(sizeof(*f) + len)))
return NULL;
f->passes_filter = _accept_p; f->passes_filter = _accept_p;
f->destroy = _destroy; f->destroy = _destroy;
f->use_count = 0; f->use_count = 0;
f->name = "sysfs"; f->name = "sysfs";
memcpy(f + 1, sysfs_dir, len);
f->private = (f + 1);
log_debug_devs("Sysfs filter initialised."); log_debug_devs("Sysfs filter initialised.");
return f; return f;
bad:
return NULL;
} }
#else #else

2
lib/filters/filter.h
View File

@ -28,7 +28,7 @@ struct dev_filter *fwraid_filter_create(struct dev_types *dt);
struct dev_filter *mpath_filter_create(struct dev_types *dt); struct dev_filter *mpath_filter_create(struct dev_types *dt);
struct dev_filter *partitioned_filter_create(struct dev_types *dt); struct dev_filter *partitioned_filter_create(struct dev_types *dt);
struct dev_filter *persistent_filter_create(struct dev_types *dt, struct dev_filter *f); struct dev_filter *persistent_filter_create(struct dev_types *dt, struct dev_filter *f);
struct dev_filter *sysfs_filter_create(void); struct dev_filter *sysfs_filter_create(const char *sysfs_dir);
struct dev_filter *signature_filter_create(struct dev_types *dt); struct dev_filter *signature_filter_create(struct dev_types *dt);
struct dev_filter *deviceid_filter_create(struct cmd_context *cmd); struct dev_filter *deviceid_filter_create(struct cmd_context *cmd);