* master - cleanup: indent
@ 2014-02-17 21:26 Zdenek Kabelac
0 siblings, 0 replies; 21+ messages in thread
From: Zdenek Kabelac @ 2014-02-17 21:26 UTC (permalink / raw)
To: lvm-devel
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=9974136b907962438079e4c634541f97d1f9fd61
Commit: 9974136b907962438079e4c634541f97d1f9fd61
Parent: 25cea92338876f7ed02b05652a2de3f28c9bae1c
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Mon Feb 17 21:49:51 2014 +0100
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Mon Feb 17 22:25:53 2014 +0100
cleanup: indent
---
lib/activate/dev_manager.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c
index fe36149..6b5f8c2 100644
--- a/lib/activate/dev_manager.c
+++ b/lib/activate/dev_manager.c
@@ -2506,7 +2506,7 @@ static int _add_new_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree,
dinfo->open_count)) {
if (seg_is_thin_volume(seg) ||
/* FIXME Is there anything simpler to check for instead? */
- !lv_has_target_type(dm->mem, lv, NULL, "snapshot-merge"))
+ !lv_has_target_type(dm->mem, lv, NULL, "snapshot-merge"))
laopts->no_merging = 1;
}
}
@@ -2562,7 +2562,7 @@ static int _add_new_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree,
return_0;
if (!laopts->no_merging && lv_is_merging_origin(lv)) {
if (!_add_new_lv_to_dtree(dm, dtree,
- find_snapshot(lv)->cow, laopts, "cow"))
+ find_snapshot(lv)->cow, laopts, "cow"))
return_0;
/*
* Must also add "real" LV for use when
^ permalink raw reply related [flat|nested] 21+ messages in thread
* master - cleanup: indent
@ 2019-01-28 21:41 Zdenek Kabelac
0 siblings, 0 replies; 21+ messages in thread
From: Zdenek Kabelac @ 2019-01-28 21:41 UTC (permalink / raw)
To: lvm-devel
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=d19e3727951853093828b072e254e447f7d61c60
Commit: d19e3727951853093828b072e254e447f7d61c60
Parent: 5cf8888976118cfbc44da28462ebaf9aae3927d7
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Thu Jan 24 14:12:42 2019 +0100
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Mon Jan 28 22:39:10 2019 +0100
cleanup: indent
---
lib/metadata/lv_manip.c | 2 +-
lib/metadata/pool_manip.c | 2 +-
lib/metadata/thin_manip.c | 2 --
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 00039ef..3b08d05 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -7350,7 +7350,7 @@ int wipe_lv(struct logical_volume *lv, struct wipe_params wp)
if (wp.do_wipe_signatures) {
log_verbose("Wiping known signatures on logical volume \"%s/%s\"",
- lv->vg->name, lv->name);
+ lv->vg->name, lv->name);
if (!wipe_known_signatures(lv->vg->cmd, dev, name, 0,
TYPE_DM_SNAPSHOT_COW,
wp.yes, wp.force, NULL))
diff --git a/lib/metadata/pool_manip.c b/lib/metadata/pool_manip.c
index 80d2e07..934bb56 100644
--- a/lib/metadata/pool_manip.c
+++ b/lib/metadata/pool_manip.c
@@ -790,7 +790,7 @@ int vg_remove_pool_metadata_spare(struct volume_group *vg)
log_print_unless_silent("Renaming existing pool metadata spare "
"logical volume \"%s\" to \"%s/%s\".",
- display_lvname(lv), vg->name, new_name);
+ display_lvname(lv), vg->name, new_name);
if (!lv_rename_update(vg->cmd, lv, new_name, 0))
return_0;
diff --git a/lib/metadata/thin_manip.c b/lib/metadata/thin_manip.c
index e1b3179..5e52889 100644
--- a/lib/metadata/thin_manip.c
+++ b/lib/metadata/thin_manip.c
@@ -266,7 +266,6 @@ int pool_below_threshold(const struct lv_segment *pool_seg)
if (!lv_thin_pool_percent(pool_seg->lv, 1, &percent))
return_0;
-
if (percent >= min_threshold) {
log_warn("WARNING: Remaining free space in metadata of thin pool %s "
"is too low (%s%% >= %s%%). "
@@ -277,7 +276,6 @@ int pool_below_threshold(const struct lv_segment *pool_seg)
return 0;
}
-
if (percent > threshold) {
log_debug("Threshold configured for free metadata space in "
"thin pool %s has been reached (%s%% > %s%%).",
^ permalink raw reply related [flat|nested] 21+ messages in thread
* master - cleanup: indent
@ 2018-02-28 20:22 Zdenek Kabelac
0 siblings, 0 replies; 21+ messages in thread
From: Zdenek Kabelac @ 2018-02-28 20:22 UTC (permalink / raw)
To: lvm-devel
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=406d6de651fd1ae3bda80f3597d7aa8733b0389a
Commit: 406d6de651fd1ae3bda80f3597d7aa8733b0389a
Parent: 16c209c613b35307105e7d022a95f58f897243aa
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Mon Feb 26 14:44:51 2018 +0100
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Wed Feb 28 21:15:55 2018 +0100
cleanup: indent
---
lib/metadata/lv_manip.c | 5 +++--
tools/lvchange.c | 3 ++-
tools/lvconvert.c | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 1e2cfc6..044214c 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -1049,12 +1049,13 @@ static int _release_and_discard_lv_segment_area(struct lv_segment *seg, uint32_t
}
if (lv_is_raid_image(lv)) {
- /* Calculate the amount of extents to reduce per rmate/rimage LV */
+ /* Calculate the amount of extents to reduce per rmeta/rimage LV */
uint32_t rimage_extents;
struct lv_segment *seg1 = first_seg(lv);
/* FIXME: avoid extra seg_is_*() conditionals here */
- rimage_extents = raid_rimage_extents(seg1->segtype, area_reduction, seg_is_any_raid0(seg) ? 0 : _raid_stripes_count(seg),
+ rimage_extents = raid_rimage_extents(seg1->segtype, area_reduction,
+ seg_is_any_raid0(seg) ? 0 : _raid_stripes_count(seg),
seg_is_raid10(seg) ? 1 :_raid_data_copies(seg));
if (!rimage_extents)
return 0;
diff --git a/tools/lvchange.c b/tools/lvchange.c
index 83dbf97..288b04c 100644
--- a/tools/lvchange.c
+++ b/tools/lvchange.c
@@ -1374,6 +1374,7 @@ static int _lvchange_activate_check(struct cmd_context *cmd,
int lvchange_activate_cmd(struct cmd_context *cmd, int argc, char **argv)
{
int ret;
+ int do_activate = is_change_activating((activation_change_t)arg_uint_value(cmd, activate_ARG, CHANGE_AY));
init_background_polling(arg_is_set(cmd, sysinit_ARG) ? 0 : arg_int_value(cmd, poll_ARG, DEFAULT_BACKGROUND_POLLING));
cmd->handles_missing_pvs = 1;
@@ -1387,7 +1388,7 @@ int lvchange_activate_cmd(struct cmd_context *cmd, int argc, char **argv)
cmd->include_active_foreign_vgs = 1;
/* Allow deactivating if locks fail. */
- if (is_change_activating((activation_change_t)arg_uint_value(cmd, activate_ARG, CHANGE_AY)))
+ if (do_activate)
cmd->lockd_vg_enforce_sh = 1;
ret = process_each_lv(cmd, argc, argv, NULL, NULL, 0,
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 8006699..63f0715 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -1948,7 +1948,7 @@ static int _lvconvert_snapshot(struct cmd_context *cmd,
* LV_foo specification because this LV is not processed by process_each_lv.
*/
if (!validate_snapshot_origin(org))
- return_0;
+ return_0;
log_warn("WARNING: Converting logical volume %s to snapshot exception store.",
snap_name);
^ permalink raw reply related [flat|nested] 21+ messages in thread
* master - cleanup: indent
@ 2016-11-25 14:04 Zdenek Kabelac
0 siblings, 0 replies; 21+ messages in thread
From: Zdenek Kabelac @ 2016-11-25 14:04 UTC (permalink / raw)
To: lvm-devel
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=108d9a63fde1608aff815359d58da641fc9a18af
Commit: 108d9a63fde1608aff815359d58da641fc9a18af
Parent: c10028dd8eb5d2302dfa588bbae034eb24d710cf
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Fri Nov 25 14:21:34 2016 +0100
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Fri Nov 25 15:01:28 2016 +0100
cleanup: indent
---
lib/metadata/lv_manip.c | 1 +
lib/metadata/raid_manip.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 615632d..10c0446 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -1033,6 +1033,7 @@ static int _release_and_discard_lv_segment_area(struct lv_segment *seg, uint32_t
return 0;
}
}
+
return 1;
}
diff --git a/lib/metadata/raid_manip.c b/lib/metadata/raid_manip.c
index 0793017..9c8ba82 100644
--- a/lib/metadata/raid_manip.c
+++ b/lib/metadata/raid_manip.c
@@ -3662,13 +3662,13 @@ static int _set_convenient_raid456_segtype_to(const struct lv_segment *seg_from,
/* Got to do check for raid5 -> raid6 ... */
} else if (seg_is_any_raid5(seg_from) &&
segtype_is_any_raid6(*segtype)) {
- log_error("Conversion not supported.");
+ log_error("Conversion not supported.");
return 0;
/* ... and raid6 -> raid5 */
} else if (seg_is_any_raid6(seg_from) &&
segtype_is_any_raid5(*segtype)) {
- log_error("Conversion not supported.");
+ log_error("Conversion not supported.");
return 0;
}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* master - cleanup: indent
@ 2016-10-11 11:39 Zdenek Kabelac
0 siblings, 0 replies; 21+ messages in thread
From: Zdenek Kabelac @ 2016-10-11 11:39 UTC (permalink / raw)
To: lvm-devel
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=8f300691603c57388a4fa092f18f121d7504e3c4
Commit: 8f300691603c57388a4fa092f18f121d7504e3c4
Parent: 6f576483a87aac67037e25914990a77e76c81423
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Tue Oct 11 11:55:19 2016 +0200
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Tue Oct 11 13:37:43 2016 +0200
cleanup: indent
---
tools/lvconvert.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 78cd7de..48e8cc8 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;
}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* master - cleanup: indent
@ 2016-04-06 9:55 Zdenek Kabelac
0 siblings, 0 replies; 21+ messages in thread
From: Zdenek Kabelac @ 2016-04-06 9:55 UTC (permalink / raw)
To: lvm-devel
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=9be7bca4be913f3edc4d4f838d72329475fa8655
Commit: 9be7bca4be913f3edc4d4f838d72329475fa8655
Parent: 0584e85736b164d07434619622d6d06ad15fe690
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Wed Apr 6 10:28:02 2016 +0200
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Wed Apr 6 11:31:02 2016 +0200
cleanup: indent
---
lib/activate/activate.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/activate/activate.c b/lib/activate/activate.c
index 7afb439..985d6b9 100644
--- a/lib/activate/activate.c
+++ b/lib/activate/activate.c
@@ -1827,7 +1827,7 @@ static int _lv_suspend(struct cmd_context *cmd, const char *lvid_s,
const struct logical_volume *lv_pre_to_free = NULL;
struct logical_volume *lv_pre_tmp;
struct seg_list *sl;
- struct lv_segment *snap_seg;
+ struct lv_segment *snap_seg;
struct lvinfo info;
int r = 0, lockfs = 0, flush_required = 0;
struct detached_lv_data detached;
^ permalink raw reply related [flat|nested] 21+ messages in thread
* master - cleanup: indent
@ 2016-02-25 22:36 Zdenek Kabelac
0 siblings, 0 replies; 21+ messages in thread
From: Zdenek Kabelac @ 2016-02-25 22:36 UTC (permalink / raw)
To: lvm-devel
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=e9b523e3044b83fc1a919f8a07a85d169c7d4d55
Commit: e9b523e3044b83fc1a919f8a07a85d169c7d4d55
Parent: 5c29b54d4dbf0a94525172f5526fd5ff7996de48
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Thu Feb 25 16:50:22 2016 +0100
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Thu Feb 25 23:30:25 2016 +0100
cleanup: indent
Last update missed to indent params.
---
lib/metadata/pv_manip.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/metadata/pv_manip.c b/lib/metadata/pv_manip.c
index 48706d1..d38262d 100644
--- a/lib/metadata/pv_manip.c
+++ b/lib/metadata/pv_manip.c
@@ -757,10 +757,10 @@ static int pvremove_check(struct cmd_context *cmd, const char *name,
if (force_count)
log_warn("WARNING: Wiping physical volume label from "
- "%s%s%s%s", name,
- !is_orphan(pv) ? " of volume group \"" : "",
- pv_vg_name(pv),
- !is_orphan(pv) ? "\"" : "");
+ "%s%s%s%s", name,
+ !is_orphan(pv) ? " of volume group \"" : "",
+ pv_vg_name(pv),
+ !is_orphan(pv) ? "\"" : "");
r = 1;
bad:
^ permalink raw reply related [flat|nested] 21+ messages in thread
* master - cleanup: indent
@ 2015-08-12 12:41 Zdenek Kabelac
0 siblings, 0 replies; 21+ messages in thread
From: Zdenek Kabelac @ 2015-08-12 12:41 UTC (permalink / raw)
To: lvm-devel
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=48ed8ac50cd0c384c3ff4e5e7dbc79b8f1c24cef
Commit: 48ed8ac50cd0c384c3ff4e5e7dbc79b8f1c24cef
Parent: ece758457de0c5a40b5b33b90cab2238de34d55e
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Tue Jul 21 11:18:42 2015 +0200
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Wed Aug 12 14:33:16 2015 +0200
cleanup: indent
---
lib/cache_segtype/cache.c | 4 ++--
lib/metadata/lv_manip.c | 3 ++-
libdm/libdm-deptree.c | 2 --
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/lib/cache_segtype/cache.c b/lib/cache_segtype/cache.c
index 53c867e..85cba18 100644
--- a/lib/cache_segtype/cache.c
+++ b/lib/cache_segtype/cache.c
@@ -170,8 +170,8 @@ static void _destroy(struct segment_type *segtype)
#ifdef DEVMAPPER_SUPPORT
static int _target_present(struct cmd_context *cmd,
- const struct lv_segment *seg __attribute__((unused)),
- unsigned *attributes __attribute__((unused)))
+ const struct lv_segment *seg __attribute__((unused)),
+ unsigned *attributes __attribute__((unused)))
{
/* List of features with their kernel target version */
static const struct feature {
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 116f099..c192d1b 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -6998,7 +6998,7 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg,
if (seg_is_pool(lp))
status |= LVM_WRITE; /* Pool is always writable */
- else if (seg_is_cache(lp) || seg_is_thin_volume(lp)) {
+ else if (seg_is_cache(lp) || seg_is_thin_volume(lp)) {
/* Resolve pool volume */
if (!lp->pool_name) {
/* Should be already checked */
@@ -7222,6 +7222,7 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg,
if (!archive(vg))
return_NULL;
+
if (pool_lv && seg_is_thin_volume(lp)) {
/* Ensure all stacked messages are submitted */
if ((pool_is_active(pool_lv) || is_change_activating(lp->activate)) &&
diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c
index 040a826..d28f0de 100644
--- a/libdm/libdm-deptree.c
+++ b/libdm/libdm-deptree.c
@@ -3405,7 +3405,6 @@ int dm_tree_node_add_cache_target(struct dm_tree_node *node,
if (!_link_tree_nodes(node, seg->metadata))
return_0;
-
if (!(seg->origin = dm_tree_find_node_by_uuid(node->dtree,
origin_uuid))) {
log_error("Missing cache's origin uuid %s.",
@@ -3434,7 +3433,6 @@ int dm_tree_node_add_cache_target(struct dm_tree_node *node,
}
}
-
return 1;
}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* master - cleanup: indent
@ 2015-01-20 14:03 Zdenek Kabelac
0 siblings, 0 replies; 21+ messages in thread
From: Zdenek Kabelac @ 2015-01-20 14:03 UTC (permalink / raw)
To: lvm-devel
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=3b78d5237ddc7dc8d328bd1b16628c5a61454826
Commit: 3b78d5237ddc7dc8d328bd1b16628c5a61454826
Parent: 3cef00c4ca25237ed045ae5def506128f8678e21
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Tue Jan 20 12:43:16 2015 +0100
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Tue Jan 20 15:02:19 2015 +0100
cleanup: indent
---
lib/activate/activate.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/lib/activate/activate.c b/lib/activate/activate.c
index 20c7c98..424786c 100644
--- a/lib/activate/activate.c
+++ b/lib/activate/activate.c
@@ -749,8 +749,7 @@ int lv_info_with_seg_status(struct cmd_context *cmd, const struct logical_volume
* we need to acquire info and status separately!
*/
return _lv_info(cmd, lv, use_layer, &status->info, NULL, NULL, with_open_count, with_read_ahead) &&
- _lv_info(cmd, lv_seg->lv, use_layer, NULL, lv_seg,
- &status->seg_status, 0, 0);
+ _lv_info(cmd, lv_seg->lv, use_layer, NULL, lv_seg, &status->seg_status, 0, 0);
}
#define OPEN_COUNT_CHECK_RETRIES 25
^ permalink raw reply related [flat|nested] 21+ messages in thread
* master - cleanup: indent
@ 2014-10-24 14:40 Zdenek Kabelac
0 siblings, 0 replies; 21+ messages in thread
From: Zdenek Kabelac @ 2014-10-24 14:40 UTC (permalink / raw)
To: lvm-devel
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=4f8ed25a999821cd37cc1e2c0051e60e8a63e371
Commit: 4f8ed25a999821cd37cc1e2c0051e60e8a63e371
Parent: c6456bd6390f6d99dd975f671c5730b0438c4c89
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Sat Oct 18 11:01:29 2014 +0200
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Fri Oct 24 16:39:31 2014 +0200
cleanup: indent
Various indents and tiny error message improvements.
---
lib/metadata/lv_manip.c | 45 ++++++++++++++++---------------------
lib/metadata/metadata-exported.h | 4 +-
lib/metadata/pool_manip.c | 2 +-
tools/lvcreate.c | 30 +++++++++----------------
4 files changed, 34 insertions(+), 47 deletions(-)
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 6240f14..ec09b41 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -6032,7 +6032,8 @@ int remove_layer_from_lv(struct logical_volume *lv,
return_0;
/* Replace the empty layer with error segment */
- segtype = get_segtype_from_string(lv->vg->cmd, "error");
+ if (!(segtype = get_segtype_from_string(lv->vg->cmd, "error")))
+ return_0;
if (!lv_add_virtual_segment(layer_lv, 0, parent->le_count, segtype, NULL))
return_0;
@@ -6050,7 +6051,7 @@ struct logical_volume *insert_layer_for_lv(struct cmd_context *cmd,
uint64_t status,
const char *layer_suffix)
{
- static char _suffixes[][8] = { "_tdata", "_cdata", "_corig" };
+ static const char _suffixes[][8] = { "_tdata", "_cdata", "_corig" };
int r;
char *name;
size_t len;
@@ -6129,7 +6130,6 @@ struct logical_volume *insert_layer_for_lv(struct cmd_context *cmd,
/* Remove the temporary tags */
dm_list_iterate_items(sl, &lv_where->tags)
str_list_del(&layer_lv->tags, sl->str);
-
}
log_very_verbose("Inserting layer %s for %s",
@@ -6166,7 +6166,7 @@ struct logical_volume *insert_layer_for_lv(struct cmd_context *cmd,
lv_names.old = lv_where->name;
lv_names.new = layer_lv->name;
if (!for_each_sub_lv(layer_lv, _rename_cb, (void *) &lv_names))
- return 0;
+ return_NULL;
break;
}
@@ -6635,8 +6635,7 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg,
}
if (lp->stripe_size > vg->extent_size) {
- if (segtype_is_raid(lp->segtype) &&
- (vg->extent_size < STRIPE_SIZE_MIN)) {
+ if (seg_is_raid(lp) && (vg->extent_size < STRIPE_SIZE_MIN)) {
/*
* FIXME: RAID will simply fail to load the table if
* this is the case, but we should probably
@@ -6677,13 +6676,12 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg,
if (seg_is_cache(lp)) {
if (!lp->pool_name) {
- log_error(INTERNAL_ERROR "Cannot create cached volume without cache pool.");
- return NULL;
+ log_error(INTERNAL_ERROR "Cannot create thin volume without thin pool.");
+ return NULL;
}
- /* We have the cache_pool, create the origin with cache */
if (!(pool_lv = find_lv(vg, lp->pool_name))) {
- log_error("Couldn't find cache pool volume %s in "
- "volume group %s.", lp->pool_name, vg->name);
+ log_error("Couldn't find volume %s in Volume group %s.",
+ lp->pool_name, vg->name);
return NULL;
}
@@ -6744,8 +6742,7 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg,
return NULL;
}
if (lv_is_locked(origin_lv)) {
- log_error("Snapshots of locked devices are not "
- "supported yet");
+ log_error("Snapshots of locked devices are not supported.");
return NULL;
}
if (lv_is_merging_origin(origin_lv)) {
@@ -6871,16 +6868,16 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg,
return_NULL;
if (lp->read_ahead != lv->read_ahead) {
- log_verbose("Setting read ahead sectors");
lv->read_ahead = lp->read_ahead;
+ log_debug_metadata("Setting read ahead sectors %u.", lv->read_ahead);
}
if (!seg_is_thin_pool(lp) && lp->minor >= 0) {
lv->major = lp->major;
lv->minor = lp->minor;
lv->status |= FIXED_MINOR;
- log_verbose("Setting device number to (%d, %d)", lv->major,
- lv->minor);
+ log_debug_metadata("Setting device number to (%d, %d).",
+ lv->major, lv->minor);
}
dm_list_splice(&lv->tags, &lp->tags);
@@ -6963,8 +6960,8 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg,
* it just as if CHANGE_AY was used, CHANGE_AN otherwise.
*/
if (lp->activate == CHANGE_AAY)
- lp->activate = lv_passes_auto_activation_filter(cmd, lv) ?
- CHANGE_ALY : CHANGE_ALN;
+ lp->activate = lv_passes_auto_activation_filter(cmd, lv)
+ ? CHANGE_ALY : CHANGE_ALN;
if (lv_activation_skip(lv, lp->activate, lp->activation_skip & ACTIVATION_SKIP_IGNORE))
lp->activate = CHANGE_AN;
@@ -7100,9 +7097,8 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg,
.yes = lp->yes,
.force = lp->force
})) {
- log_error("Aborting. Failed to wipe %s.",
- lp->snapshot ? "snapshot exception store" :
- "start of new LV");
+ log_error("Aborting. Failed to wipe %s.", lp->snapshot
+ ? "snapshot exception store" : "start of new LV");
goto deactivate_and_revert_new_lv;
}
}
@@ -7120,8 +7116,8 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg,
if ((vg_is_clustered(vg) ||
(!lp->voriginsize && !lv_is_active(origin_lv))) &&
!deactivate_lv(cmd, lv)) {
- log_error("Aborting. Couldn't deactivate snapshot "
- "COW area. Manual intervention required.");
+ log_error("Aborting. Couldn't deactivate snapshot COW area. "
+ "Manual intervention required.");
return NULL;
}
@@ -7150,9 +7146,8 @@ static struct logical_volume *_lv_create_an_lv(struct volume_group *vg,
/* store vg on disk(s) */
if (!lv_update_and_reload(origin_lv))
- return_0;
+ return_NULL;
}
-
out:
return lv;
diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
index bf6f1c1..1af9cbf 100644
--- a/lib/metadata/metadata-exported.h
+++ b/lib/metadata/metadata-exported.h
@@ -783,7 +783,7 @@ int is_mirror_image_removable(struct logical_volume *mimage_lv, void *baton);
typedef enum activation_change {
CHANGE_AY = 0, /* activate */
CHANGE_AN = 1, /* deactivate */
- CHANGE_AEY = 2, /* activate exclusively */
+ CHANGE_AEY = 2, /* activate exclusively */
CHANGE_ALY = 3, /* activate locally */
CHANGE_ALN = 4, /* deactivate locally */
CHANGE_AAY = 5 /* automatic activation */
@@ -801,7 +801,7 @@ struct lvcreate_params {
int cache;
int snapshot; /* snap */
int thin; /* thin */
- int create_pool; /* thin */
+ int create_pool; /* pools */
int zero; /* all */
int wipe_signatures; /* all */
int32_t major; /* all */
diff --git a/lib/metadata/pool_manip.c b/lib/metadata/pool_manip.c
index 2fbadea..02a82bd 100644
--- a/lib/metadata/pool_manip.c
+++ b/lib/metadata/pool_manip.c
@@ -433,7 +433,7 @@ int create_pool(struct logical_volume *pool_lv,
*/
pool_lv->status |= LV_TEMPORARY;
if (!activate_lv_local(pool_lv->vg->cmd, pool_lv) ||
- /* Clear 4KB of metadata device for new thin-pool. */
+ /* Clear 4KB of pool metadata device. */
!wipe_lv(pool_lv, (struct wipe_params) { .do_zero = 1 })) {
log_error("Aborting. Failed to wipe pool metadata %s.",
pool_lv->name);
diff --git a/tools/lvcreate.c b/tools/lvcreate.c
index 5a91627..7573a2e 100644
--- a/tools/lvcreate.c
+++ b/tools/lvcreate.c
@@ -390,8 +390,8 @@ static int _update_extents_params(struct volume_group *vg,
extents = percent_of_extents(lp->extents, vg->extent_count, 0);
break;
case PERCENT_LV:
- log_error("Please express size as %s%%VG, %%PVS, "
- "or %%FREE.", (lp->snapshot) ? "%ORIGIN, " : "");
+ log_error("Please express size as %%FREE%s, %%PVS or %%VG.",
+ (lp->snapshot) ? ", %ORIGIN" : "");
return 0;
case PERCENT_ORIGIN:
if (lp->snapshot && lp->origin_name &&
@@ -667,8 +667,7 @@ static int _read_raid_params(struct lvcreate_params *lp,
/*
* RAID1 does not take a stripe arg
*/
- if ((lp->stripes > 1) &&
- segtype_is_mirrored(lp->segtype) &&
+ if ((lp->stripes > 1) && seg_is_mirrored(lp) &&
strcmp(lp->segtype->name, SEG_TYPE_NAME_RAID10)) {
log_error("Stripe argument cannot be used with segment type, %s",
lp->segtype->name);
@@ -713,11 +712,10 @@ static int _read_cache_pool_params(struct lvcreate_params *lp,
{
const char *cachemode;
- if (!segtype_is_cache_pool(lp->segtype))
+ if (!seg_is_cache(lp) && !seg_is_cache_pool(lp))
return 1;
- cachemode = arg_str_value(cmd, cachemode_ARG, NULL);
- if (!cachemode)
+ if (!(cachemode = arg_str_value(cmd, cachemode_ARG, NULL)))
cachemode = find_config_tree_str(cmd, allocation_cache_pool_cachemode_CFG, NULL);
if (!get_cache_mode(cachemode, &lp->feature_flags))
@@ -748,9 +746,7 @@ static int _read_activation_params(struct lvcreate_params *lp,
lp->zero = 0;
}
- /*
- * Read ahead.
- */
+ /* Read ahead */
lp->read_ahead = arg_uint_value(cmd, readahead_ARG,
cmd->default_settings.read_ahead);
pagesize = lvm_getpagesize() >> SECTOR_SHIFT;
@@ -765,9 +761,7 @@ static int _read_activation_params(struct lvcreate_params *lp,
"of %uK page size.", lp->read_ahead, pagesize >> 1);
}
- /*
- * Permissions.
- */
+ /* Permissions */
lp->permission = arg_uint_value(cmd, permission_ARG,
LVM_READ | LVM_WRITE);
@@ -790,7 +784,7 @@ static int _read_activation_params(struct lvcreate_params *lp,
if (!get_and_validate_major_minor(cmd, vg->fid->fmt,
&lp->major, &lp->minor))
- return_0;
+ return_0;
} else if (arg_is_set(cmd, major_ARG) || arg_is_set(cmd, minor_ARG)) {
log_error("--major and --minor require -My.");
return 0;
@@ -1048,13 +1042,11 @@ static int _lvcreate_params(struct lvcreate_params *lp,
* Allocation parameters
*/
contiguous = arg_int_value(cmd, contiguous_ARG, 0);
-
lp->alloc = contiguous ? ALLOC_CONTIGUOUS : ALLOC_INHERIT;
-
lp->alloc = (alloc_policy_t) arg_uint_value(cmd, alloc_ARG, lp->alloc);
if (contiguous && (lp->alloc != ALLOC_CONTIGUOUS)) {
- log_error("Conflicting contiguous and alloc arguments");
+ log_error("Conflicting contiguous and alloc arguments.");
return 0;
}
@@ -1063,12 +1055,12 @@ static int _lvcreate_params(struct lvcreate_params *lp,
continue;
if (!(tag = grouped_arg_str_value(current_group->arg_values, addtag_ARG, NULL))) {
- log_error("Failed to get tag");
+ log_error("Failed to get tag.");
return 0;
}
if (!str_list_add(cmd->mem, &lp->tags, tag)) {
- log_error("Unable to allocate memory for tag %s", tag);
+ log_error("Unable to allocate memory for tag %s.", tag);
return 0;
}
}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* master - cleanup: indent
@ 2014-10-06 13:33 Zdenek Kabelac
0 siblings, 0 replies; 21+ messages in thread
From: Zdenek Kabelac @ 2014-10-06 13:33 UTC (permalink / raw)
To: lvm-devel
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b7a78d81bc52b8a9078bd9d57ab900032f8e5729
Commit: b7a78d81bc52b8a9078bd9d57ab900032f8e5729
Parent: d9d50e4533193d75057bb2444eb899d33598968a
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Mon Oct 6 12:10:00 2014 +0200
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Mon Oct 6 15:23:08 2014 +0200
cleanup: indent
---
tools/lvcreate.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/lvcreate.c b/tools/lvcreate.c
index 97c8d94..0dc3699 100644
--- a/tools/lvcreate.c
+++ b/tools/lvcreate.c
@@ -1240,8 +1240,8 @@ int lvcreate(struct cmd_context *cmd, int argc, char **argv)
{
int r = ECMD_FAILED;
struct lvcreate_params lp = {
- .major = -1,
- .minor = -1,
+ .major = -1,
+ .minor = -1,
};
struct lvcreate_cmdline_params lcp;
struct volume_group *vg;
^ permalink raw reply related [flat|nested] 21+ messages in thread
* master - cleanup: indent
@ 2014-05-23 19:38 Zdenek Kabelac
0 siblings, 0 replies; 21+ messages in thread
From: Zdenek Kabelac @ 2014-05-23 19:38 UTC (permalink / raw)
To: lvm-devel
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=1a840323229555889184e831000b0c22f273ef66
Commit: 1a840323229555889184e831000b0c22f273ef66
Parent: bf6b69c46b77f7b61c688b99b2bbaab0c46d840c
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Fri May 23 14:25:12 2014 +0200
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Fri May 23 21:37:12 2014 +0200
cleanup: indent
---
lib/metadata/lv_manip.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 5fa75e1..76a9103 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -4310,7 +4310,7 @@ int lv_resize_prepare(struct cmd_context *cmd, struct logical_volume *lv,
if (lp->poolmetadatasize &&
!_lvresize_poolmetadata_prepare(cmd, lp, lv))
- return_0;
+ return_0;
return 1;
}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* master - cleanup: indent
@ 2014-05-21 22:56 Zdenek Kabelac
0 siblings, 0 replies; 21+ messages in thread
From: Zdenek Kabelac @ 2014-05-21 22:56 UTC (permalink / raw)
To: lvm-devel
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=aafd7c878c2a4bdcb72182bd31e52bae280898d1
Commit: aafd7c878c2a4bdcb72182bd31e52bae280898d1
Parent: 3ac7d2deb4270504dbae369b0b1bf14cb25a1b38
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Wed May 21 23:10:02 2014 +0200
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Wed May 21 23:14:41 2014 +0200
cleanup: indent
---
lib/metadata/metadata.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index 4791c10..fd81c1b 100644
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -769,7 +769,7 @@ int vg_reduce(struct volume_group *vg, const char *pv_name)
}
log_error("Unable to remove physical volume '%s' from "
- "volume group '%s'.", pv_name, vg->name);
+ "volume group '%s'.", pv_name, vg->name);
return 0;
}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* master - cleanup: indent
@ 2014-05-20 19:53 Zdenek Kabelac
0 siblings, 0 replies; 21+ messages in thread
From: Zdenek Kabelac @ 2014-05-20 19:53 UTC (permalink / raw)
To: lvm-devel
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=54184f92acea10de5b75ad013f6c8aaf7db03176
Commit: 54184f92acea10de5b75ad013f6c8aaf7db03176
Parent: 2941cffd2c6bf67ea2b47696e0ad111f07cf921d
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Tue May 20 20:10:55 2014 +0200
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Tue May 20 21:50:28 2014 +0200
cleanup: indent
---
tools/lvconvert.c | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/tools/lvconvert.c b/tools/lvconvert.c
index 03cd42d..50771b4 100644
--- a/tools/lvconvert.c
+++ b/tools/lvconvert.c
@@ -1077,15 +1077,13 @@ static void _lvconvert_mirrors_repair_ask(struct cmd_context *cmd,
return;
if (failed_log &&
- yes_no_prompt("Attempt to replace failed mirror log? [y/n]: ") == 'n') {
+ yes_no_prompt("Attempt to replace failed mirror log? [y/n]: ") == 'n')
*replace_log = 0;
- }
if (failed_mirrors &&
yes_no_prompt("Attempt to replace failed mirror images "
- "(requires full device resync)? [y/n]: ") == 'n') {
+ "(requires full device resync)? [y/n]: ") == 'n')
*replace_mirrors = 0;
- }
}
/*
@@ -1677,14 +1675,12 @@ static int _lvconvert_mirrors_repair(struct cmd_context *cmd,
if (_lvconvert_mirrors_aux(cmd, lv, lp, NULL,
lp->mirrors, log_count))
break;
- else {
- if (lp->mirrors > 2)
- -- lp->mirrors;
- else if (log_count > 0)
- -- log_count;
- else
- break; /* nowhere to go, anymore... */
- }
+ if (lp->mirrors > 2)
+ --lp->mirrors;
+ else if (log_count > 0)
+ --log_count;
+ else
+ break; /* nowhere to go, anymore... */
}
if (replace_mimages && lv_mirror_count(lv) != original_mimages)
^ permalink raw reply related [flat|nested] 21+ messages in thread
* master - cleanup: indent
@ 2014-04-30 8:28 Zdenek Kabelac
0 siblings, 0 replies; 21+ messages in thread
From: Zdenek Kabelac @ 2014-04-30 8:28 UTC (permalink / raw)
To: lvm-devel
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=62e8dd4f6ec73b6f94f66c3b14cdf3d80c06a2af
Commit: 62e8dd4f6ec73b6f94f66c3b14cdf3d80c06a2af
Parent: cbdf63fdd21216af78077ae2d02ac307a3deec0a
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Tue Apr 29 20:14:05 2014 +0200
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Wed Apr 30 10:26:30 2014 +0200
cleanup: indent
---
lib/metadata/lv.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c
index 54306a2..4dbcb20 100644
--- a/lib/metadata/lv.c
+++ b/lib/metadata/lv.c
@@ -154,8 +154,7 @@ char *lvseg_monitor_dup(struct dm_pool *mem, const struct lv_segment *seg)
else if (!seg_monitored(segm) || (segm->status & PVMOVE))
s = "not monitored";
else if (lv_info(seg->lv->vg->cmd, seg->lv, 1, &info, 0, 0) && info.exists) {
- monitored = segm->segtype->ops->
- target_monitored((struct lv_segment*)segm, &pending);
+ monitored = segm->segtype->ops->target_monitored(segm, &pending);
if (pending)
s = "pending";
else
^ permalink raw reply related [flat|nested] 21+ messages in thread
* master - cleanup: indent
@ 2014-03-25 10:23 Zdenek Kabelac
0 siblings, 0 replies; 21+ messages in thread
From: Zdenek Kabelac @ 2014-03-25 10:23 UTC (permalink / raw)
To: lvm-devel
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=5c9165705a3303d6ac98c828420566e01c2d128e
Commit: 5c9165705a3303d6ac98c828420566e01c2d128e
Parent: c7b2c08a6b30422cfa95da0348876f54b6f4cf6f
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Mon Mar 24 09:19:37 2014 +0100
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Tue Mar 25 11:22:58 2014 +0100
cleanup: indent
---
daemons/dmeventd/libdevmapper-event.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/daemons/dmeventd/libdevmapper-event.c b/daemons/dmeventd/libdevmapper-event.c
index 1e723d7..8775449 100644
--- a/daemons/dmeventd/libdevmapper-event.c
+++ b/daemons/dmeventd/libdevmapper-event.c
@@ -553,8 +553,8 @@ static struct dm_task *_get_device_info(const struct dm_event_handler *dmevh)
if (!info.exists) {
log_error("_get_device_info: %s%s%s%.0d%s%.0d%s%s: device not found",
- dmevh->uuid ? : "",
- (!dmevh->uuid && dmevh->dev_name) ? dmevh->dev_name : "",
+ dmevh->uuid ? : "",
+ (!dmevh->uuid && dmevh->dev_name) ? dmevh->dev_name : "",
(!dmevh->uuid && !dmevh->dev_name && dmevh->major > 0) ? "(" : "",
(!dmevh->uuid && !dmevh->dev_name && dmevh->major > 0) ? dmevh->major : 0,
(!dmevh->uuid && !dmevh->dev_name && dmevh->major > 0) ? ":" : "",
@@ -564,7 +564,6 @@ static struct dm_task *_get_device_info(const struct dm_event_handler *dmevh)
goto bad;
}
-
return dmt;
bad:
^ permalink raw reply related [flat|nested] 21+ messages in thread
* master - cleanup: indent
@ 2014-03-19 0:02 Zdenek Kabelac
0 siblings, 0 replies; 21+ messages in thread
From: Zdenek Kabelac @ 2014-03-19 0:02 UTC (permalink / raw)
To: lvm-devel
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b6eb2ac10ab509a74f83b9333ff195b63d64d8ef
Commit: b6eb2ac10ab509a74f83b9333ff195b63d64d8ef
Parent: 852a2b98be2c83a3ddb31396f49854a3d14cf6ed
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Wed Mar 19 00:24:09 2014 +0100
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Wed Mar 19 00:58:02 2014 +0100
cleanup: indent
---
lib/metadata/metadata.c | 4 ++--
tools/pvdisplay.c | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index c79f223..279043b 100644
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -4157,7 +4157,7 @@ static struct volume_group *_vg_lock_and_read(struct cmd_context *cmd, const cha
uint64_t status_flags, uint32_t misc_flags)
{
struct volume_group *vg = NULL;
- int consistent = 1;
+ int consistent = 1;
int consistent_in;
uint32_t failure = 0;
int already_locked;
@@ -4279,7 +4279,7 @@ bad:
* *consistent = 1.
*/
struct volume_group *vg_read(struct cmd_context *cmd, const char *vg_name,
- const char *vgid, uint32_t flags)
+ const char *vgid, uint32_t flags)
{
uint64_t status = UINT64_C(0);
uint32_t lock_flags = LCK_VG_READ;
diff --git a/tools/pvdisplay.c b/tools/pvdisplay.c
index 198267c..34ec3d5 100644
--- a/tools/pvdisplay.c
+++ b/tools/pvdisplay.c
@@ -36,18 +36,18 @@ static int _pvdisplay_single(struct cmd_context *cmd,
return ret;
}
- /*
+ /*
* Replace possibly incomplete PV structure with new one
* allocated in vg_read_internal() path.
*/
- if (!(pvl = find_pv_in_vg(vg, pv_name))) {
- log_error("Unable to find \"%s\" in volume group \"%s\"",
- pv_name, vg->name);
- ret = ECMD_FAILED;
- goto out;
- }
-
- pv = pvl->pv;
+ if (!(pvl = find_pv_in_vg(vg, pv_name))) {
+ log_error("Unable to find \"%s\" in volume group \"%s\"",
+ pv_name, vg->name);
+ ret = ECMD_FAILED;
+ goto out;
+ }
+
+ pv = pvl->pv;
}
if (is_orphan(pv))
^ permalink raw reply related [flat|nested] 21+ messages in thread
* master - cleanup: indent
@ 2014-02-18 20:28 Zdenek Kabelac
0 siblings, 0 replies; 21+ messages in thread
From: Zdenek Kabelac @ 2014-02-18 20:28 UTC (permalink / raw)
To: lvm-devel
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=750a310a40c09cd222d52299f2d682082d6a133c
Commit: 750a310a40c09cd222d52299f2d682082d6a133c
Parent: e6fd16f8ea5e859925268838dba9341527c91a4c
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Tue Feb 18 21:21:06 2014 +0100
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Tue Feb 18 21:22:00 2014 +0100
cleanup: indent
---
tools/vgchange.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/vgchange.c b/tools/vgchange.c
index 814238b..cb2d84b 100644
--- a/tools/vgchange.c
+++ b/tools/vgchange.c
@@ -597,8 +597,8 @@ int vgchange(struct cmd_context *cmd, int argc, char **argv)
return EINVALID_CMD_LINE;
}
- if (arg_count(cmd, activate_ARG) == 1
- && arg_count(cmd, autobackup_ARG)) {
+ if ((arg_count(cmd, activate_ARG) == 1) &&
+ arg_count(cmd, autobackup_ARG)) {
log_error("-A option not necessary with -a option");
return EINVALID_CMD_LINE;
}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* master - cleanup: indent
@ 2014-01-24 11:30 Zdenek Kabelac
0 siblings, 0 replies; 21+ messages in thread
From: Zdenek Kabelac @ 2014-01-24 11:30 UTC (permalink / raw)
To: lvm-devel
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=432ff4bd720596bd3e56290c29646e8ba43575fb
Commit: 432ff4bd720596bd3e56290c29646e8ba43575fb
Parent: 5e4647ec99b1de0923a311004e86649b50f81c1f
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Fri Jan 24 10:49:31 2014 +0100
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Fri Jan 24 12:30:28 2014 +0100
cleanup: indent
---
lib/metadata/thin_manip.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/metadata/thin_manip.c b/lib/metadata/thin_manip.c
index 92c4177..b26723b 100644
--- a/lib/metadata/thin_manip.c
+++ b/lib/metadata/thin_manip.c
@@ -86,9 +86,9 @@ int attach_pool_message(struct lv_segment *pool_seg, dm_thin_message_t type,
dm_list_add(&pool_seg->thin_messages, &tmsg->list);
- log_debug_metadata("Added %s message",
+ log_debug_metadata("Added %s message.",
(type == DM_THIN_MESSAGE_CREATE_SNAP ||
- type == DM_THIN_MESSAGE_CREATE_THIN) ? "create" :
+ type == DM_THIN_MESSAGE_CREATE_THIN) ? "create" :
(type == DM_THIN_MESSAGE_DELETE) ? "delete" : "unknown");
return 1;
^ permalink raw reply related [flat|nested] 21+ messages in thread
* master - cleanup: indent
@ 2014-01-17 10:01 Zdenek Kabelac
0 siblings, 0 replies; 21+ messages in thread
From: Zdenek Kabelac @ 2014-01-17 10:01 UTC (permalink / raw)
To: lvm-devel
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=d98511c717d64f111208e647e861620e310118d6
Commit: d98511c717d64f111208e647e861620e310118d6
Parent: 5eee73bd7cb8e4712ad5e5d13a3bffb78e02c9ca
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Wed Jan 8 16:51:11 2014 +0100
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Fri Jan 17 10:48:49 2014 +0100
cleanup: indent
---
libdm/libdm-deptree.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c
index 7bc1f33..db88d9d 100644
--- a/libdm/libdm-deptree.c
+++ b/libdm/libdm-deptree.c
@@ -1620,8 +1620,8 @@ static int _dm_tree_deactivate_children(struct dm_tree_node *dnode,
}
int dm_tree_deactivate_children(struct dm_tree_node *dnode,
- const char *uuid_prefix,
- size_t uuid_prefix_len)
+ const char *uuid_prefix,
+ size_t uuid_prefix_len)
{
return _dm_tree_deactivate_children(dnode, uuid_prefix, uuid_prefix_len, 0);
}
^ permalink raw reply related [flat|nested] 21+ messages in thread
* master - cleanup: indent
@ 2013-03-13 14:15 Zdenek Kabelac
0 siblings, 0 replies; 21+ messages in thread
From: Zdenek Kabelac @ 2013-03-13 14:15 UTC (permalink / raw)
To: lvm-devel
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=293a06c39a45bcdcaabb2fa95e46f39466ef627f
Commit: 293a06c39a45bcdcaabb2fa95e46f39466ef627f
Parent: 521a0a3323507e1d07568d3047283975e66ca193
Author: Zdenek Kabelac <zkabelac@redhat.com>
AuthorDate: Sun Feb 24 19:37:01 2013 +0100
Committer: Zdenek Kabelac <zkabelac@redhat.com>
CommitterDate: Wed Mar 13 15:13:42 2013 +0100
cleanup: indent
---
lib/activate/dev_manager.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c
index 8aa49fc..b8ee2f3 100644
--- a/lib/activate/dev_manager.c
+++ b/lib/activate/dev_manager.c
@@ -1307,7 +1307,7 @@ static uint16_t _get_udev_flags(struct dev_manager *dm, struct logical_volume *l
}
static int _add_dev_to_dtree(struct dev_manager *dm, struct dm_tree *dtree,
- struct logical_volume *lv, const char *layer)
+ struct logical_volume *lv, const char *layer)
{
char *dlid, *name;
struct dm_info info, info2;
^ permalink raw reply related [flat|nested] 21+ messages in thread
end of thread, other threads:[~2019-01-28 21:41 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-17 21:26 master - cleanup: indent Zdenek Kabelac
-- strict thread matches above, loose matches on Subject: below --
2019-01-28 21:41 Zdenek Kabelac
2018-02-28 20:22 Zdenek Kabelac
2016-11-25 14:04 Zdenek Kabelac
2016-10-11 11:39 Zdenek Kabelac
2016-04-06 9:55 Zdenek Kabelac
2016-02-25 22:36 Zdenek Kabelac
2015-08-12 12:41 Zdenek Kabelac
2015-01-20 14:03 Zdenek Kabelac
2014-10-24 14:40 Zdenek Kabelac
2014-10-06 13:33 Zdenek Kabelac
2014-05-23 19:38 Zdenek Kabelac
2014-05-21 22:56 Zdenek Kabelac
2014-05-20 19:53 Zdenek Kabelac
2014-04-30 8:28 Zdenek Kabelac
2014-03-25 10:23 Zdenek Kabelac
2014-03-19 0:02 Zdenek Kabelac
2014-02-18 20:28 Zdenek Kabelac
2014-01-24 11:30 Zdenek Kabelac
2014-01-17 10:01 Zdenek Kabelac
2013-03-13 14:15 Zdenek Kabelac
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.