cleanup: use proper activation_change_t

diff --git a/lib/cache/lvmetad.h b/lib/cache/lvmetad.h
index 713c5a308b8f8bd7dda5c349a695c609a6c7af14..932a9f1bf94be989b1ed9dbb6172f627c66c23c4 100644 (file)
--- a/lib/cache/lvmetad.h
+++ b/lib/cache/lvmetad.h
@@ -18,8 +18,10 @@
 struct volume_group;
 struct cmd_context;
 struct dm_config_tree;
+typedef enum activation_change activation_change_t;
 
-typedef int (*activation_handler) (struct volume_group *vg, int partial, int activate);
+typedef int (*activation_handler) (struct volume_group *vg, int partial,
+                                  activation_change_t activate);
 
 #ifdef LVMETAD_SUPPORT
 /*

diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
index f39f968785b57c2081cd6d65c53cc0dcdbaf0c5b..0658fade36a528dfab27a37e0fd672374d105d3a 100644 (file)
--- a/lib/metadata/metadata-exported.h
+++ b/lib/metadata/metadata-exported.h
@@ -571,7 +571,7 @@ const char *get_pool_discards_name(thin_discards_t discards);
 /*
  * Activation options
  */
-typedef enum {
+typedef enum activation_change {
        CHANGE_AY = 0,  /* activate */
        CHANGE_AN = 1,  /* deactivate */
        CHANGE_AE = 2,  /* activate exclusively */

diff --git a/tools/pvscan.c b/tools/pvscan.c
index a846322e9fc03f51f984427bf7ff2714ea066112..6c634e354663c703d6ee30cf63da00d120d78db4 100644 (file)
--- a/tools/pvscan.c
+++ b/tools/pvscan.c
@@ -97,7 +97,8 @@ static void _pvscan_display_single(struct cmd_context *cmd,
                                           pv_pe_size(pv)));
 }
 
-static int _auto_activation_handler(struct volume_group *vg, int partial, int activate)
+static int _auto_activation_handler(struct volume_group *vg, int partial,
+                                   activation_change_t activate)
 {
        /* TODO: add support for partial and clustered VGs */
        if (partial || vg_is_clustered(vg))

diff --git a/tools/vgchange.c b/tools/vgchange.c
index 2013447b09c62506598d2bcc456877cd07a5eafc..c59d58e0f7f3a51b1a9ae60e65602b2effb87450 100644 (file)
--- a/tools/vgchange.c
+++ b/tools/vgchange.c
@@ -512,7 +512,8 @@ static int vgchange_single(struct cmd_context *cmd, const char *vg_name,
        }
 
        if (arg_count(cmd, activate_ARG)) {
-               if (!vgchange_activate(cmd, vg, arg_uint_value(cmd, activate_ARG, CHANGE_AY)))
+               if (!vgchange_activate(cmd, vg, (activation_change_t)
+                                      arg_uint_value(cmd, activate_ARG, CHANGE_AY)))
                        return ECMD_FAILED;
        }