integrity: always default to journal mode

lvconvert was defaulting to bitmap mode,
and lvcreate was defaulting to journal mode.

diff --git a/lib/metadata/integrity_manip.c b/lib/metadata/integrity_manip.c
index 3322a210159ce4ee80bcbbb16c7de6ea2fc4ca62..290b7a8630c839996a89c5bb3362a4084b5dabef 100644 (file)
--- a/lib/metadata/integrity_manip.c
+++ b/lib/metadata/integrity_manip.c
@@ -303,6 +303,21 @@ int lv_remove_integrity_from_raid(struct logical_volume *lv)
        return 1;
 }
 
+int integrity_mode_set(const char *mode, struct integrity_settings *settings)
+{
+       if (!mode)
+               settings->mode[0] = DEFAULT_MODE;
+       else if (!strcmp(mode, "bitmap") || !strcmp(mode, "B"))
+               settings->mode[0] = 'B';
+       else if (!strcmp(mode, "journal") || !strcmp(mode, "J"))
+               settings->mode[0] = 'J';
+       else {
+               log_error("Invalid raid integrity mode (use \"bitmap\" or \"journal\")");
+               return 0;
+       }
+       return 1;
+}
+
 static int _set_integrity_block_size(struct cmd_context *cmd, struct logical_volume *lv, int is_active,
                                     struct integrity_settings *settings,
                                     int lbs_4k, int lbs_512, int pbs_4k, int pbs_512)

diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
index db41ca36cc20f8fc16a185782db1ca1d504bfe23..e5c8e43053b7424dfedc4359d063b54c4bea6a10 100644 (file)
--- a/lib/metadata/metadata-exported.h
+++ b/lib/metadata/metadata-exported.h
@@ -1414,5 +1414,6 @@ int lv_has_integrity_recalculate_metadata(struct logical_volume *lv);
 int lv_raid_has_integrity(struct logical_volume *lv);
 int lv_extend_integrity_in_raid(struct logical_volume *lv, struct dm_list *pvh);
 int lv_get_raid_integrity_settings(struct logical_volume *lv, struct integrity_settings **isettings);
+int integrity_mode_set(const char *mode, struct integrity_settings *settings);
 
 #endif

diff --git a/tools/toollib.c b/tools/toollib.c
index eb0de5501406b6789a85e22cc2c64dc20fd3cff6..019346ce9130a0c260f61d72968778dd364fd050 100644 (file)
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -718,20 +718,6 @@ int vgcreate_params_set_from_args(struct cmd_context *cmd,
        return 1;
 }
 
-int integrity_mode_set(const char *mode, struct integrity_settings *settings)
-{
-       if (!mode || !strcmp(mode, "bitmap") || !strcmp(mode, "B"))
-               settings->mode[0] = 'B';
-       else if (!strcmp(mode, "journal") || !strcmp(mode, "J"))
-               settings->mode[0] = 'J';
-       else {
-               /* FIXME: the kernel has other modes, should we allow any of those? */
-               log_error("Invalid raid integrity mode (use \"bitmap\" or \"journal\")");
-               return 0;
-       }
-       return 1;
-}
-
 /* Shared code for changing activation state for vgchange/lvchange */
 int lv_change_activate(struct cmd_context *cmd, struct logical_volume *lv,
                       activation_change_t activate)

diff --git a/tools/tools.h b/tools/tools.h
index befff57080acaea1e2b796028bc5ed53eea02c3c..a0be4bedb6384503d818a8022855aab50ff0f70f 100644 (file)
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -212,8 +212,6 @@ unsigned grouped_arg_is_set(const struct arg_values *av, int a);
 const char *grouped_arg_str_value(const struct arg_values *av, int a, const char *def);
 int32_t grouped_arg_int_value(const struct arg_values *av, int a, const int32_t def); 
 
-int integrity_mode_set(const char *mode, struct integrity_settings *settings);
-
 const char *command_name(struct cmd_context *cmd);
 
 int pvmove_poll(struct cmd_context *cmd, const char *pv_name, const char *uuid,