summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2016-10-11 11:55:19 +0200
committerZdenek Kabelac <zkabelac@redhat.com>2016-10-11 13:37:43 +0200
commit8f300691603c57388a4fa092f18f121d7504e3c4 (patch)
treeae48bba7dc8e2dc4463948af008673303bb0eadd
parent6f576483a87aac67037e25914990a77e76c81423 (diff)
downloadlvm2-8f300691603c57388a4fa092f18f121d7504e3c4.tar.gz
cleanup: indent
-rw-r--r--tools/lvconvert.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 78cd7de55..48e8cc889 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -330,6 +330,7 @@ static int _read_conversion_type(struct cmd_context *cmd,
return 1;
log_error("Conversion using --type %s is not supported.", type_str);
+
return 0;
}
@@ -561,7 +562,6 @@ static int _read_params(struct cmd_context *cmd, int argc, char **argv,
log_error("--snapshot and --merge are mutually exclusive.");
return 0;
}
-
lp->snapshot = 1;
}
@@ -627,9 +627,7 @@ static int _read_params(struct cmd_context *cmd, int argc, char **argv,
}
if (arg_is_set(cmd, mirrors_ARG)) {
- /*
- * --splitmirrors is the mechanism for detaching and keeping a mimage
- */
+ /* --splitmirrors is the mechanism for detaching and keeping a mimage */
lp->mirrors_supplied = 1;
lp->mirrors = arg_uint_value(cmd, mirrors_ARG, 0);
lp->mirrors_sign = arg_sign_value(cmd, mirrors_ARG, SIGN_NONE);
@@ -4272,6 +4270,7 @@ static int _convert_raid(struct cmd_context *cmd, struct logical_volume *lv,
struct lvconvert_params *lp)
{
/* Permitted convert options on visible or hidden RaidLVs */
+ /* The --thinpool alternative for --type thin-pool is not preferred, so not shown. */
const char *permitted_options = lv_is_visible(lv) ?
" --mirrors\n"
" --splitmirrors\n"
@@ -4347,13 +4346,12 @@ static int _convert_raid(struct cmd_context *cmd, struct logical_volume *lv,
if (segtype_is_cache_pool(lp->segtype) ||
arg_is_set(cmd, cachepool_ARG))
return _convert_raid_cache_pool(cmd, lv, lp);
-
- /* The --thinpool alternative for --type thin-pool is not preferred, so not shown. */
}
out:
log_error("Operation not permitted on raid LV %s.", display_lvname(lv));
log_error("Operations permitted on a raid LV are:\n%s", permitted_options);
+
return 0;
}