shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

lvconvert: indent and code simplification

Browse Source 
Simple modifications to existing  _lvconvert_to_pool().
This commit is contained in:
Zdenek Kabelac 2017-02-24 12:52:19 +01:00
parent dd2881f277
commit 7ad57d55af
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/metadata/cache_manip.c
View File

@ -292,7 +292,7 @@ int validate_lv_cache_create_pool(const struct logical_volume *pool_lv)
if (!dm_list_empty(&pool_lv->segs_using_this_lv)) { if (!dm_list_empty(&pool_lv->segs_using_this_lv)) {
seg = get_only_segment_using_this_lv(pool_lv); seg = get_only_segment_using_this_lv(pool_lv);
log_error("Logical volume %s is already in use by %s", log_error("Logical volume %s is already in use by %s.",
display_lvname(pool_lv), display_lvname(pool_lv),
seg ? display_lvname(seg->lv) : "another LV"); seg ? display_lvname(seg->lv) : "another LV");
return 0; return 0;

24
tools/lvconvert.c
View File

@ -2689,6 +2689,7 @@ static int _lvconvert_to_pool(struct cmd_context *cmd,
char *lockd_meta_name = NULL; char *lockd_meta_name = NULL;
struct id lockd_data_id; struct id lockd_data_id;
struct id lockd_meta_id; struct id lockd_meta_id;
const char *str_seg_type = to_cachepool ? SEG_TYPE_NAME_CACHE_POOL : SEG_TYPE_NAME_THIN_POOL;
if (lv_is_thin_pool(lv) || lv_is_cache_pool(lv)) { if (lv_is_thin_pool(lv) || lv_is_cache_pool(lv)) {
@ -2696,11 +2697,11 @@ static int _lvconvert_to_pool(struct cmd_context *cmd,
return 0; return 0;
} }
pool_segtype = to_cachepool ? get_segtype_from_string(cmd, SEG_TYPE_NAME_CACHE_POOL) : pool_segtype = get_segtype_from_string(cmd, str_seg_type);
get_segtype_from_string(cmd, SEG_TYPE_NAME_THIN_POOL);
if (!pool_segtype->ops->target_present(cmd, NULL, &target_attr)) { if (!pool_segtype->ops->target_present(cmd, NULL, &target_attr)) {
log_error("%s: Required device-mapper target(s) not detected in your kernel.", pool_segtype->name); log_error("%s: Required device-mapper target(s) not detected in your kernel.",
pool_segtype->name);
return 0; return 0;
} }
@ -2708,7 +2709,7 @@ static int _lvconvert_to_pool(struct cmd_context *cmd,
activate_pool = to_thinpool && lv_is_active(lv); activate_pool = to_thinpool && lv_is_active(lv);
/* Wipe metadata_lv by default, but allow skipping this for cache pools. */ /* Wipe metadata_lv by default, but allow skipping this for cache pools. */
zero_metadata = to_cachepool ? arg_int_value(cmd, zero_ARG, 1) : 1; zero_metadata = (to_cachepool) ? arg_int_value(cmd, zero_ARG, 1) : 1;
/* An existing LV needs to have its lock freed once it becomes a data LV. */ /* An existing LV needs to have its lock freed once it becomes a data LV. */
if (is_lockd_type(vg->lock_type) && lv->lock_args) { if (is_lockd_type(vg->lock_type) && lv->lock_args) {
@ -2787,10 +2788,8 @@ static int _lvconvert_to_pool(struct cmd_context *cmd,
chunk_size = arg_uint_value(cmd, chunksize_ARG, 0); chunk_size = arg_uint_value(cmd, chunksize_ARG, 0);
if (!validate_pool_chunk_size(cmd, pool_segtype, chunk_size)) if (!validate_pool_chunk_size(cmd, pool_segtype, chunk_size))
return_0; return_0;
} else { } else /* A default will be chosen by the "update" function. */
/* A default will be chosen by the "update" function. */
chunk_size = 0; chunk_size = 0;
}
if (arg_is_set(cmd, poolmetadatasize_ARG)) { if (arg_is_set(cmd, poolmetadatasize_ARG)) {
meta_size = arg_uint64_value(cmd, poolmetadatasize_ARG, UINT64_C(0)); meta_size = arg_uint64_value(cmd, poolmetadatasize_ARG, UINT64_C(0));
@ -2799,10 +2798,8 @@ static int _lvconvert_to_pool(struct cmd_context *cmd,
} else if (metadata_lv) { } else if (metadata_lv) {
meta_extents = metadata_lv->le_count; meta_extents = metadata_lv->le_count;
passed_args |= PASS_ARG_POOL_METADATA_SIZE; passed_args |= PASS_ARG_POOL_METADATA_SIZE;
} else { } else /* A default will be chosen by the "update" function. */
/* A default will be chosen by the "update" function. */
meta_extents = 0; meta_extents = 0;
}
/* Tell the "update" function to ignore these, they are handled below. */ /* Tell the "update" function to ignore these, they are handled below. */
passed_args |= PASS_ARG_DISCARDS | PASS_ARG_ZERO; passed_args |= PASS_ARG_DISCARDS | PASS_ARG_ZERO;
@ -2935,6 +2932,7 @@ static int _lvconvert_to_pool(struct cmd_context *cmd,
log_error("Aborting. Failed to activate metadata lv."); log_error("Aborting. Failed to activate metadata lv.");
return 0; return 0;
} }
metadata_lv->status &= ~LV_TEMPORARY;
if (!wipe_lv(metadata_lv, (struct wipe_params) { .do_zero = 1 })) { if (!wipe_lv(metadata_lv, (struct wipe_params) { .do_zero = 1 })) {
log_error("Aborting. Failed to wipe metadata lv."); log_error("Aborting. Failed to wipe metadata lv.");
@ -3171,8 +3169,8 @@ revert_new_lv:
} }
static int _lvconvert_to_cache_vol(struct cmd_context *cmd, static int _lvconvert_to_cache_vol(struct cmd_context *cmd,
struct logical_volume *lv, struct logical_volume *lv,
struct logical_volume *cachepool_lv) struct logical_volume *cachepool_lv)
{ {
struct logical_volume *cache_lv; struct logical_volume *cache_lv;
cache_mode_t cache_mode = 0; cache_mode_t cache_mode = 0;
@ -3894,7 +3892,6 @@ static int _lvconvert_to_cache_vol_single(struct cmd_context *cmd,
log_warn("WARNING: Reusing cache pool metadata %s for volume caching.", log_warn("WARNING: Reusing cache pool metadata %s for volume caching.",
display_lvname(cachepool_lv)); display_lvname(cachepool_lv));
} }
} }
/* When the lv arg is a thinpool, redirect command to data sub lv. */ /* When the lv arg is a thinpool, redirect command to data sub lv. */
@ -4582,4 +4579,3 @@ int lvconvert(struct cmd_context *cmd, int argc, char **argv)
cmd->command->command_index, cmd->command->command_id); cmd->command->command_index, cmd->command->command_id);
return ECMD_FAILED; return ECMD_FAILED;
} }