public inbox for lvm2-cvs@sourceware.org
help / color / mirror / Atom feed
* LVM2 lib/metadata/lv_manip.c lib/metadata/thin ...
@ 2011-11-10 12:43 zkabelac
0 siblings, 0 replies; 2+ messages in thread
From: zkabelac @ 2011-11-10 12:43 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: zkabelac@sourceware.org 2011-11-10 12:43:06
Modified files:
lib/metadata : lv_manip.c thin_manip.c
tools : lvcreate.c toollib.c
Log message:
Small comment and indent updates
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/lv_manip.c.diff?cvsroot=lvm2&r1=1.329&r2=1.330
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/thin_manip.c.diff?cvsroot=lvm2&r1=1.25&r2=1.26
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvcreate.c.diff?cvsroot=lvm2&r1=1.249&r2=1.250
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/toollib.c.diff?cvsroot=lvm2&r1=1.233&r2=1.234
--- LVM2/lib/metadata/lv_manip.c 2011/11/10 12:42:36 1.329
+++ LVM2/lib/metadata/lv_manip.c 2011/11/10 12:43:05 1.330
@@ -4263,7 +4263,6 @@
init_dmeventd_monitor(lp->activation_monitoring);
if (seg_is_thin(lp)) {
-
/* For thin snapshot suspend active thin origin first */
if (org && lv_is_active(org)) {
if (!suspend_lv(cmd, org)) {
--- LVM2/lib/metadata/thin_manip.c 2011/11/07 11:04:45 1.25
+++ LVM2/lib/metadata/thin_manip.c 2011/11/10 12:43:05 1.26
@@ -346,7 +346,7 @@
}
if (activate) {
- /* If the pool was not yet activated, do it */
+ /* If the pool is not active, do activate deactivate */
if (!lv_is_active(lv)) {
if (!activate_lv_excl(lv->vg->cmd, lv))
return_0;
--- LVM2/tools/lvcreate.c 2011/11/10 12:40:29 1.249
+++ LVM2/tools/lvcreate.c 2011/11/10 12:43:05 1.250
@@ -200,7 +200,8 @@
struct lv_list *lvl;
if (!(lvl = find_lv_in_vg(vg, lp->origin))) {
- log_error("Snapshot origin LV %s not found in Volume group %s.", lp->origin, vg->name);
+ log_error("Snapshot origin LV %s not found in Volume group %s.",
+ lp->origin, vg->name);
return 0;
}
@@ -222,7 +223,7 @@
/*
* Update extents parameters based on other parameters which affect the size
- * calcuation.
+ * calculation.
* NOTE: We must do this here because of the percent_t typedef and because we
* need the vg.
*/
--- LVM2/tools/toollib.c 2011/11/03 14:59:20 1.233
+++ LVM2/tools/toollib.c 2011/11/10 12:43:05 1.234
@@ -329,6 +329,7 @@
dm_list_iterate_items(sll, &arg_lvnames) {
const char *vg_name = sll->str;
const char *lv_name = strchr(vg_name, '/');
+log_error("VGNAME strdup %p %s %s", lv_name, vg_name, vgname);
if ((!lv_name && !strcmp(vg_name, vgname))) {
/* Process all LVs in this VG */
^ permalink raw reply [flat|nested] 2+ messages in thread
* LVM2 lib/metadata/lv_manip.c lib/metadata/thin ...
@ 2011-10-19 16:36 zkabelac
0 siblings, 0 replies; 2+ messages in thread
From: zkabelac @ 2011-10-19 16:36 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: zkabelac@sourceware.org 2011-10-19 16:36:40
Modified files:
lib/metadata : lv_manip.c thin_manip.c
libdm : libdm-deptree.c
Log message:
Just indent changes
Some tabs & spaces.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/lv_manip.c.diff?cvsroot=lvm2&r1=1.295&r2=1.296
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/thin_manip.c.diff?cvsroot=lvm2&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdm-deptree.c.diff?cvsroot=lvm2&r1=1.129&r2=1.130
--- LVM2/lib/metadata/lv_manip.c 2011/10/17 14:17:09 1.295
+++ LVM2/lib/metadata/lv_manip.c 2011/10/19 16:36:39 1.296
@@ -511,6 +511,7 @@
/* FIXME Check this is safe */
if (seg->log_lv && !lv_remove(seg->log_lv))
return_0;
+
if (seg->pool_metadata_lv && !lv_remove(seg->pool_metadata_lv))
return_0;
--- LVM2/lib/metadata/thin_manip.c 2011/10/19 16:32:34 1.8
+++ LVM2/lib/metadata/thin_manip.c 2011/10/19 16:36:40 1.9
@@ -21,9 +21,9 @@
{
seg->pool_metadata_lv = pool_metadata_lv;
pool_metadata_lv->status |= THIN_POOL_METADATA;
- lv_set_hidden(pool_metadata_lv);
+ lv_set_hidden(pool_metadata_lv);
- return add_seg_to_segs_using_this_lv(pool_metadata_lv, seg);
+ return add_seg_to_segs_using_this_lv(pool_metadata_lv, seg);
}
int attach_pool_data_lv(struct lv_segment *seg, struct logical_volume *pool_data_lv)
@@ -31,9 +31,9 @@
if (!set_lv_segment_area_lv(seg, 0, pool_data_lv, 0, THIN_POOL_DATA))
return_0;
- lv_set_hidden(pool_data_lv);
+ lv_set_hidden(pool_data_lv);
- return 1;
+ return 1;
}
int attach_pool_lv(struct lv_segment *seg, struct logical_volume *pool_lv)
@@ -41,7 +41,7 @@
seg->pool_lv = pool_lv;
seg->lv->status |= THIN_VOLUME;
- return add_seg_to_segs_using_this_lv(pool_lv, seg);
+ return add_seg_to_segs_using_this_lv(pool_lv, seg);
}
int detach_pool_lv(struct lv_segment *seg)
@@ -117,22 +117,22 @@
struct lv_segment *find_pool_seg(const struct lv_segment *seg)
{
- struct lv_segment *pool_seg;
+ struct lv_segment *pool_seg;
+
+ pool_seg = get_only_segment_using_this_lv(seg->lv);
- pool_seg = get_only_segment_using_this_lv(seg->lv);
+ if (!pool_seg) {
+ log_error("Failed to find pool_seg for %s", seg->lv->name);
+ return NULL;
+ }
- if (!pool_seg) {
- log_error("Failed to find pool_seg for %s", seg->lv->name);
- return NULL;
- }
-
- if (!seg_is_thin_pool(pool_seg)) {
- log_error("%s on %s is not a pool segment",
- pool_seg->lv->name, seg->lv->name);
- return NULL;
- }
+ if (!seg_is_thin_pool(pool_seg)) {
+ log_error("%s on %s is not a pool segment",
+ pool_seg->lv->name, seg->lv->name);
+ return NULL;
+ }
- return pool_seg;
+ return pool_seg;
}
/*
--- LVM2/libdm/libdm-deptree.c 2011/10/19 16:36:01 1.129
+++ LVM2/libdm/libdm-deptree.c 2011/10/19 16:36:40 1.130
@@ -1342,7 +1342,6 @@
return 1;
seg = dm_list_item(dm_list_last(&dnode->props.segs), struct load_segment);
-
if (seg->type != SEG_THIN_POOL)
return 1;
@@ -2887,7 +2886,6 @@
}
seg = dm_list_item(dm_list_last(&node->props.segs), struct load_segment);
-
if (seg->type != SEG_THIN_POOL) {
log_error(INTERNAL_ERROR "Attempt to use non thin pool segment %s.",
dm_segtypes[seg->type].target);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-11-10 12:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-11-10 12:43 LVM2 lib/metadata/lv_manip.c lib/metadata/thin zkabelac
-- strict thread matches above, loose matches on Subject: below --
2011-10-19 16:36 zkabelac
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).