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: allow filter wipe for one device

Browse Source 
as passes_filter already does
This commit is contained in:
David Teigland 2020-10-20 15:17:56 -05:00
parent 83d0818523
commit c601ec0d6e
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/device/dev-cache.h
View File

@ -28,7 +28,7 @@ struct cmd_context;
struct dev_filter { struct dev_filter {
int (*passes_filter) (struct cmd_context *cmd, struct dev_filter *f, struct device *dev, const char *use_filter_name); int (*passes_filter) (struct cmd_context *cmd, struct dev_filter *f, struct device *dev, const char *use_filter_name);
void (*destroy) (struct dev_filter *f); void (*destroy) (struct dev_filter *f);
void (*wipe) (struct dev_filter *f); void (*wipe) (struct cmd_context *cmd, struct dev_filter *f, struct device *dev, const char *use_filter_name);
void *private; void *private;
unsigned use_count; unsigned use_count;
const char *name; const char *name;

9
lib/filters/filter-composite.c
View File

@ -60,13 +60,16 @@ static void _composite_destroy(struct dev_filter *f)
free(f); free(f);
} }
static void _wipe(struct dev_filter *f) static void _wipe(struct cmd_context *cmd, struct dev_filter *f, struct device *dev, const char *use_filter_name)
{ {
struct dev_filter **filters; struct dev_filter **filters;
for (filters = (struct dev_filter **) f->private; *filters; ++filters) for (filters = (struct dev_filter **) f->private; *filters; ++filters) {
if (use_filter_name && strcmp((*filters)->name, use_filter_name))
continue;
if ((*filters)->wipe) if ((*filters)->wipe)
(*filters)->wipe(*filters); (*filters)->wipe(cmd, *filters, dev, use_filter_name);
}
} }
struct dev_filter *composite_filter_create(int n, int use_dev_ext_info, struct dev_filter **filters) struct dev_filter *composite_filter_create(int n, int use_dev_ext_info, struct dev_filter **filters)

10
lib/filters/filter-persistent.c
View File

@ -64,11 +64,17 @@ static int _init_hash(struct pfilter *pf)
return 1; return 1;
} }
static void _persistent_filter_wipe(struct dev_filter *f) static void _persistent_filter_wipe(struct cmd_context *cmd, struct dev_filter *f, struct device *dev, const char *use_filter_name)
{ {
struct pfilter *pf = (struct pfilter *) f->private; struct pfilter *pf = (struct pfilter *) f->private;
struct dm_str_list *sl;
dm_hash_wipe(pf->devices); if (!dev) {
dm_hash_wipe(pf->devices);
} else {
dm_list_iterate_items(sl, &dev->aliases)
dm_hash_remove(pf->devices, sl->str);
}
} }
static int _lookup_p(struct cmd_context *cmd, struct dev_filter *f, struct device *dev, const char *use_filter_name) static int _lookup_p(struct cmd_context *cmd, struct dev_filter *f, struct device *dev, const char *use_filter_name)