shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

indent

Browse Source
This commit is contained in:
Alasdair Kergon 2004-05-11 18:45:11 +00:00
parent f75c11ed27
commit 1a51586c0c
2 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/lvmcmdline.c
View File

@ -384,8 +384,8 @@ static void _register_commands()
{
#define xx(a, b, c...) _register_command(# a, a, b, ## c, \
driverloaded_ARG, \
debug_ARG, help_ARG, help2_ARG, \
version_ARG, verbose_ARG, \
debug_ARG, help_ARG, help2_ARG, \
version_ARG, verbose_ARG, \
quiet_ARG, -1);
#include "commands.h"
#undef xx

44
tools/toollib.c
View File

@ -51,8 +51,9 @@ int process_each_lv_in_vg(struct cmd_context *cmd, struct volume_group *vg,
/* Or if VG tags match */
if (!process_lv && tags_supplied &&
str_list_match_list(tags, &vg->tags))
str_list_match_list(tags, &vg->tags)) {
process_all = 1;
}
list_iterate_items(lvl, &vg->lvs) {
/* Should we process this LV? */
@ -63,8 +64,9 @@ int process_each_lv_in_vg(struct cmd_context *cmd, struct volume_group *vg,
/* LV tag match? */
if (!process_lv && tags_supplied &&
str_list_match_list(tags, &lvl->lv->tags))
str_list_match_list(tags, &lvl->lv->tags)) {
process_lv = 1;
}
/* LV name match? */
if (lvargs_supplied &&
@ -193,7 +195,7 @@ int process_each_lv(struct cmd_context *cmd, int argc, char **argv,
continue;
}
} else if (!dev_dir_found &&
(vgname_def = default_vgname(cmd))) {
(vgname_def = default_vgname(cmd))) {
vgname = vgname_def;
} else
lv_name = NULL;
@ -206,7 +208,8 @@ int process_each_lv(struct cmd_context *cmd, int argc, char **argv,
if (!lv_name) {
if (!str_list_add(cmd->mem, &arg_lvnames,
pool_strdup(cmd->mem, vgname))) {
pool_strdup(cmd->mem,
vgname))) {
log_error("strlist allocation failed");
return ECMD_FAILED;
}
@ -248,8 +251,7 @@ int process_each_lv(struct cmd_context *cmd, int argc, char **argv,
consistent = 1;
else
consistent = 0;
if (!(vg = vg_read(cmd, vgname, &consistent)) ||
!consistent) {
if (!(vg = vg_read(cmd, vgname, &consistent)) || !consistent) {
unlock_vg(cmd, vgname);
if (!vg)
log_error("Volume group \"%s\" "
@ -257,9 +259,7 @@ int process_each_lv(struct cmd_context *cmd, int argc, char **argv,
else
log_error("Volume group \"%s\" "
"inconsistent", vgname);
if (!vg || !(vg =
recover_vg(cmd, vgname,
lock_type))) {
if (!vg || !(vg = recover_vg(cmd, vgname, lock_type))) {
unlock_vg(cmd, vgname);
if (ret_max < ECMD_FAILED)
ret_max = ECMD_FAILED;
@ -283,8 +283,8 @@ int process_each_lv(struct cmd_context *cmd, int argc, char **argv,
if (!str_list_add(cmd->mem, &lvnames,
pool_strdup(cmd->mem,
lv_name + 1))) {
log_error("strlist allocation failed");
return ECMD_FAILED;
log_error("strlist allocation failed");
return ECMD_FAILED;
}
}
}
@ -349,8 +349,9 @@ static int _process_one_vg(struct cmd_context *cmd, const char *vg_name,
}
if ((ret = process_single(cmd, vg_name, vg, consistent,
handle)) > ret_max)
handle)) > ret_max) {
ret_max = ret;
}
unlock_vg(cmd, vg_name);
@ -452,8 +453,9 @@ int process_each_pv_in_vg(struct cmd_context *cmd, struct volume_group *vg,
list_iterate_items(pvl, &vg->pvs) {
if (tags && !list_empty(tags) &&
!str_list_match_list(tags, &pvl->pv->tags))
!str_list_match_list(tags, &pvl->pv->tags)) {
continue;
}
if ((ret = process_single(cmd, vg, pvl->pv, handle)) > ret_max)
ret_max = ret;
}
@ -769,8 +771,7 @@ static void _create_pv_entry(struct pool *mem, struct pv_list *pvl,
}
if (pvl->pv->pe_count == pvl->pv->pe_alloc_count) {
log_err("No free extents on physical volume \"%s\"",
pvname);
log_err("No free extents on physical volume \"%s\"", pvname);
return;
}
@ -844,11 +845,11 @@ struct list *create_pv_list(struct pool *mem,
}
}
if (!(pvl = find_pv_in_vg(vg, pvname))) {
log_err("Physical Volume \"%s\" not found in "
"Volume Group \"%s\"", pvname, vg->name);
return NULL;
}
if (!(pvl = find_pv_in_vg(vg, pvname))) {
log_err("Physical Volume \"%s\" not found in "
"Volume Group \"%s\"", pvname, vg->name);
return NULL;
}
_create_pv_entry(mem, pvl, colon, r);
}
@ -858,9 +859,6 @@ struct list *create_pv_list(struct pool *mem,
return list_empty(r) ? NULL : r;
}
struct list *clone_pv_list(struct pool *mem, struct list *pvsl)
{
struct list *r;