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

tidy: else after continue

Browse Source 
Similar as with 'else' after 'return'  unindent whole block
for better readability of code.
This commit is contained in:
Zdenek Kabelac 2017-07-19 23:12:48 +02:00
parent 0bf836aa14
commit 4ef6cfc882
3 changed files with 70 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/activate/activate.c
View File

@ -150,14 +150,14 @@ static int _lv_passes_volumes_filter(struct cmd_context *cmd, const struct logic
|| str_list_match_list(&cmd->tags, || str_list_match_list(&cmd->tags,
&lv->vg->tags, NULL)) &lv->vg->tags, NULL))
return 1; return 1;
else
continue; continue;
} }
/* If supplied tag matches LV or VG tag, activate */ /* If supplied tag matches LV or VG tag, activate */
if (str_list_match_item(&lv->tags, str) || if (str_list_match_item(&lv->tags, str) ||
str_list_match_item(&lv->vg->tags, str)) str_list_match_item(&lv->vg->tags, str))
return 1; return 1;
else
continue; continue;
} }

2
lib/format1/import-extents.c
View File

@ -134,7 +134,6 @@ static int _fill_maps(struct dm_hash_table *maps, struct volume_group *vg,
if (lv_num == UNMAPPED_EXTENT) if (lv_num == UNMAPPED_EXTENT)
continue; continue;
else {
lv_num--; lv_num--;
lvm = lvms[lv_num]; lvm = lvms[lv_num];
@ -166,7 +165,6 @@ static int _fill_maps(struct dm_hash_table *maps, struct volume_group *vg,
lvm->map[le].pe = i; lvm->map[le].pe = i;
} }
} }
}
return 1; return 1;
} }

9
lib/metadata/lv_manip.c
View File

@ -2155,9 +2155,10 @@ static int _match_pv_tags(const struct dm_config_node *cling_tag_list_cn,
} }
continue; continue;
} }
if (!str_list_match_list(&pv1->tags, tags_to_match, &tag_matched)) if (!str_list_match_list(&pv1->tags, tags_to_match, &tag_matched))
continue; continue;
else {
if (!pv_tags) { if (!pv_tags) {
if (parallel_pv) if (parallel_pv)
log_debug_alloc("Not using free space on %s: Matched allocation PV tag %s on existing parallel PV %s.", log_debug_alloc("Not using free space on %s: Matched allocation PV tag %s on existing parallel PV %s.",
@ -2171,12 +2172,11 @@ static int _match_pv_tags(const struct dm_config_node *cling_tag_list_cn,
area_num, pv_dev_name(pv1), pv1_start_pe, tag_matched); area_num, pv_dev_name(pv1), pv1_start_pe, tag_matched);
return 1; return 1;
} }
}
if (!str_list_match_item(&pv1->tags, str) || if (!str_list_match_item(&pv1->tags, str) ||
(tags_to_match && !str_list_match_item(tags_to_match, str))) (tags_to_match && !str_list_match_item(tags_to_match, str)))
continue; continue;
else {
if (mem) { if (mem) {
if (!first_tag && !dm_pool_grow_object(mem, ",", 0)) { if (!first_tag && !dm_pool_grow_object(mem, ",", 0)) {
log_error("PV tags string extension failed."); log_error("PV tags string extension failed.");
@ -2189,6 +2189,7 @@ static int _match_pv_tags(const struct dm_config_node *cling_tag_list_cn,
} }
continue; continue;
} }
if (!pv_tags) { if (!pv_tags) {
if (parallel_pv) if (parallel_pv)
log_debug_alloc("Not using free space on %s: Matched allocation PV tag %s on existing parallel PV %s.", log_debug_alloc("Not using free space on %s: Matched allocation PV tag %s on existing parallel PV %s.",
@ -2200,9 +2201,9 @@ static int _match_pv_tags(const struct dm_config_node *cling_tag_list_cn,
log_debug_alloc("Eliminating allocation area %" PRIu32 " at PV %s start PE %" PRIu32 log_debug_alloc("Eliminating allocation area %" PRIu32 " at PV %s start PE %" PRIu32
" from consideration: PV tag %s already used.", " from consideration: PV tag %s already used.",
area_num, pv_dev_name(pv1), pv1_start_pe, str); area_num, pv_dev_name(pv1), pv1_start_pe, str);
return 1; return 1;
} }
}
if (mem) if (mem)
return 1; return 1;