diff options
| author | Peter Rajnoha <prajnoha@redhat.com> | 2012-06-29 10:28:53 +0200 |
|---|---|---|
| committer | Peter Rajnoha <prajnoha@redhat.com> | 2012-06-29 10:28:53 +0200 |
| commit | ec8f377748f4922d6a18ff0136e9a93f1d0b3f86 (patch) | |
| tree | 94dd6d602a4e65c9e0385ed91eced3b74f3d8834 /lib | |
| parent | 2cec4b4a7748cefe4e2b8adcd1c287af354e21fb (diff) | |
| download | lvm2-ec8f377748f4922d6a18ff0136e9a93f1d0b3f86.tar.gz lvm2-ec8f377748f4922d6a18ff0136e9a93f1d0b3f86.tar.xz lvm2-ec8f377748f4922d6a18ff0136e9a93f1d0b3f86.zip | |
cleanup: static volume filter fn, lvm.conf comment
Change 'lv_passes_volumes_filter' fn back to static as it's not
actually needed in the other code (a remnant from devel version).
Fix lvm.conf comment referencing '--autoactivate' which was finally
decided to be '--activate ay'.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/activate/activate.c | 10 | ||||
| -rw-r--r-- | lib/activate/activate.h | 3 |
2 files changed, 5 insertions, 8 deletions
diff --git a/lib/activate/activate.c b/lib/activate/activate.c index 939de6c7..3156f01f 100644 --- a/lib/activate/activate.c +++ b/lib/activate/activate.c @@ -328,8 +328,8 @@ int activation(void) return _activation; } -int lv_passes_volumes_filter(struct cmd_context *cmd, struct logical_volume *lv, - const struct dm_config_node *cn, const char *config_path) +static int _lv_passes_volumes_filter(struct cmd_context *cmd, struct logical_volume *lv, + const struct dm_config_node *cn, const char *config_path) { const struct dm_config_value *cv; const char *str; @@ -427,7 +427,7 @@ static int _passes_activation_filter(struct cmd_context *cmd, return 0; } - return lv_passes_volumes_filter(cmd, lv, cn, "activation/volume_list"); + return _lv_passes_volumes_filter(cmd, lv, cn, "activation/volume_list"); } static int _passes_readonly_filter(struct cmd_context *cmd, @@ -438,7 +438,7 @@ static int _passes_readonly_filter(struct cmd_context *cmd, if (!(cn = find_config_tree_node(cmd, "activation/read_only_volume_list"))) return 0; - return lv_passes_volumes_filter(cmd, lv, cn, "activation/read_only_volume_list"); + return _lv_passes_volumes_filter(cmd, lv, cn, "activation/read_only_volume_list"); } @@ -452,7 +452,7 @@ int lv_passes_auto_activation_filter(struct cmd_context *cmd, struct logical_vol return 1; } - return lv_passes_volumes_filter(cmd, lv, cn, "activation/auto_activation_volume_list"); + return _lv_passes_volumes_filter(cmd, lv, cn, "activation/auto_activation_volume_list"); } int library_version(char *version, size_t size) diff --git a/lib/activate/activate.h b/lib/activate/activate.h index f698fc99..f473a11f 100644 --- a/lib/activate/activate.h +++ b/lib/activate/activate.h @@ -93,9 +93,6 @@ int lv_check_not_in_use(struct cmd_context *cmd, struct logical_volume *lv, */ int lv_activation_filter(struct cmd_context *cmd, const char *lvid_s, int *activate_lv); -int lv_passes_volumes_filter(struct cmd_context *cmd, struct logical_volume *lv, - const struct dm_config_node *cn, const char *config_path); - /* * Checks against the auto_activation_volume_list and * returns 1 if the LV should be activated, 0 otherwise. |