shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-22 17:35:59 +03:00
Code Releases Activity

cleanup: simplify

Browse Source
This commit is contained in:
Zdenek Kabelac 2021-03-12 13:25:42 +01:00
parent 664d3b0f22
commit b563c926ba
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/lvconvert.c
View File

@ -4958,7 +4958,7 @@ static int _lvconvert_split_cache_single(struct cmd_context *cmd,
struct logical_volume *lv_main = NULL; struct logical_volume *lv_main = NULL;
struct logical_volume *lv_fast = NULL; struct logical_volume *lv_fast = NULL;
struct lv_segment *seg; struct lv_segment *seg;
int ret; int ret = 0;
if (lv_is_writecache(lv)) { if (lv_is_writecache(lv)) {
lv_main = lv; lv_main = lv;
@ -5031,10 +5031,8 @@ static int _lvconvert_split_cache_single(struct cmd_context *cmd,
log_print_unless_silent("Logical volume %s is not cached and %s is unused.", log_print_unless_silent("Logical volume %s is not cached and %s is unused.",
display_lvname(lv), display_lvname(lv_fast)); display_lvname(lv), display_lvname(lv_fast));
} else { } else
log_error(INTERNAL_ERROR "Unknown cache split command."); log_error(INTERNAL_ERROR "Unknown cache split command.");
ret = 0;
}
} else if (lv_is_cache(lv_main) && lv_is_cache_pool(lv_fast)) { } else if (lv_is_cache(lv_main) && lv_is_cache_pool(lv_fast)) {
if (cmd->command->command_enum == lvconvert_split_and_remove_cache_CMD) if (cmd->command->command_enum == lvconvert_split_and_remove_cache_CMD)
@ -5043,14 +5041,10 @@ static int _lvconvert_split_cache_single(struct cmd_context *cmd,
else if (cmd->command->command_enum == lvconvert_split_and_keep_cache_CMD) else if (cmd->command->command_enum == lvconvert_split_and_keep_cache_CMD)
ret = _lvconvert_split_and_keep_cachepool(cmd, lv_main, lv_fast); ret = _lvconvert_split_and_keep_cachepool(cmd, lv_main, lv_fast);
else { else
log_error(INTERNAL_ERROR "Unknown cache split command."); log_error(INTERNAL_ERROR "Unknown cache split command.");
ret = 0; } else
}
} else {
log_error(INTERNAL_ERROR "Unknown cache split command."); log_error(INTERNAL_ERROR "Unknown cache split command.");
ret = 0;
}
if (!ret) if (!ret)
return ECMD_FAILED; return ECMD_FAILED;