diff options
author | Petr Rockai <prockai@redhat.com> | 2011-08-30 14:55:15 +0000 |
---|---|---|
committer | Petr Rockai <prockai@redhat.com> | 2011-08-30 14:55:15 +0000 |
commit | e59e2f7c3c1e2fa170dfca2ee0c29cca2d4f55c1 (patch) | |
tree | 197a579049ddab74d8944939a45f8e0d46b6c3cf /lib/filters/filter.c | |
parent | d35188058be01bd29128dcf1f5b79220fbcb135b (diff) | |
download | lvm2-e59e2f7c3c1e2fa170dfca2ee0c29cca2d4f55c1.tar.gz lvm2-e59e2f7c3c1e2fa170dfca2ee0c29cca2d4f55c1.tar.xz lvm2-e59e2f7c3c1e2fa170dfca2ee0c29cca2d4f55c1.zip |
Move the core of the lib/config/config.c functionality into libdevmapper,
leaving behind the LVM-specific parts of the code (convenience wrappers that
handle `struct device` and `struct cmd_context`, basically). A number of
functions have been renamed (in addition to getting a dm_ prefix) -- namely,
all of the config interface now has a dm_config_ prefix.
Diffstat (limited to 'lib/filters/filter.c')
-rw-r--r-- | lib/filters/filter.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/filters/filter.c b/lib/filters/filter.c index a9b99a53..f2398a1f 100644 --- a/lib/filters/filter.c +++ b/lib/filters/filter.c @@ -177,7 +177,7 @@ static int _passes_lvm_type_device_filter(struct dev_filter *f __attribute__((un return ret; } -static int _scan_proc_dev(const char *proc, const struct config_node *cn) +static int _scan_proc_dev(const char *proc, const struct dm_config_node *cn) { char line[80]; char proc_devices[PATH_MAX]; @@ -186,7 +186,7 @@ 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; - const struct config_value *cv; + const struct dm_config_value *cv; const char *name; @@ -269,7 +269,7 @@ static int _scan_proc_dev(const char *proc, const struct config_node *cn) /* Check devices/types for local variations */ for (cv = cn->v; cv; cv = cv->next) { - if (cv->type != CFG_STRING) { + if (cv->type != DM_CFG_STRING) { log_error("Expecting string in devices/types " "in config file"); if (fclose(pd)) @@ -279,7 +279,7 @@ static int _scan_proc_dev(const char *proc, const struct config_node *cn) dev_len = strlen(cv->v.str); name = cv->v.str; cv = cv->next; - if (!cv || cv->type != CFG_INT) { + if (!cv || cv->type != DM_CFG_INT) { log_error("Max partition count missing for %s " "in devices/types in config file", name); @@ -316,7 +316,7 @@ int max_partitions(int major) } struct dev_filter *lvm_type_filter_create(const char *proc, - const struct config_node *cn) + const struct dm_config_node *cn) { struct dev_filter *f; |