r228 - in lvm2/upstream/current: . lib/activate lib/device tools

[Bastian Blank]

Author: waldi
Date: Fri Dec  2 18:56:38 2005
New Revision: 228

Modified:
   lvm2/upstream/current/VERSION
   lvm2/upstream/current/WHATS_NEW
   lvm2/upstream/current/lib/activate/dev_manager.c
   lvm2/upstream/current/lib/device/dev-io.c
   lvm2/upstream/current/tools/lvcreate.c
   lvm2/upstream/current/tools/lvdisplay.c
Log:
Load LVM2.2.02.01 into /lvm2/upstream/current.


Modified: lvm2/upstream/current/VERSION
==============================================================================
--- lvm2/upstream/current/VERSION	(original)
+++ lvm2/upstream/current/VERSION	Fri Dec  2 18:56:38 2005
@@ -1 +1 @@
-2.02.00 (2005-11-10)
+2.02.01 (2005-11-23)

Modified: lvm2/upstream/current/WHATS_NEW
==============================================================================
--- lvm2/upstream/current/WHATS_NEW	(original)
+++ lvm2/upstream/current/WHATS_NEW	Fri Dec  2 18:56:38 2005
@@ -1,3 +1,9 @@
+Version 2.02.01 - 23rd November 2005
+====================================
+  Fix lvdisplay cmdline to accept snapshots.
+  Fix open RO->RW promotion.
+  Fix missing vg_revert in lvcreate error path.
+
 Version 2.02.00 - 10th November 2005
 ====================================
   Extend allocation areas to avoid overflow with contiguous with other PVs.

Modified: lvm2/upstream/current/lib/activate/dev_manager.c
==============================================================================
--- lvm2/upstream/current/lib/activate/dev_manager.c	(original)
+++ lvm2/upstream/current/lib/activate/dev_manager.c	Fri Dec  2 18:56:38 2005
@@ -845,7 +845,6 @@
 	    dm_tree_node_get_context(dnode))
 		return 1;
 
-	/* FIXME How do we determine whether a pre-existing node need reloading or not? */
 	if (!(lvlayer = dm_pool_alloc(dm->mem, sizeof(*lvlayer)))) {
 		log_error("_add_new_lv_to_dtree: pool alloc failed for %s %s.", lv->name, layer);
 		return 0;

Modified: lvm2/upstream/current/lib/device/dev-io.c
==============================================================================
--- lvm2/upstream/current/lib/device/dev-io.c	(original)
+++ lvm2/upstream/current/lib/device/dev-io.c	Fri Dec  2 18:56:38 2005
@@ -418,7 +418,6 @@
 	    ((fstat(dev->fd, &buf) < 0) || (buf.st_rdev != dev->dev))) {
 		log_error("%s: fstat failed: Has device name changed?", name);
 		dev_close_immediate(dev);
-		dev->open_count = 0;
 		return 0;
 	}
 
@@ -509,11 +508,9 @@
 	if (dev->open_count > 0)
 		dev->open_count--;
 
-	if (immediate && dev->open_count) {
+	if (immediate && dev->open_count)
 		log_debug("%s: Immediate close attempt while still referenced",
 			  dev_name(dev));
-		dev->open_count = 0;
-	}
 
 	/* Close unless device is known to belong to a locked VG */
 	if (immediate ||

Modified: lvm2/upstream/current/tools/lvcreate.c
==============================================================================
--- lvm2/upstream/current/tools/lvcreate.c	(original)
+++ lvm2/upstream/current/tools/lvcreate.c	Fri Dec  2 18:56:38 2005
@@ -761,6 +761,7 @@
 
 		if (!suspend_lv(cmd, org)) {
 			log_error("Failed to suspend origin %s", org->name);
+			vg_revert(vg);
 			return 0;
 		}
 

Modified: lvm2/upstream/current/tools/lvdisplay.c
==============================================================================
--- lvm2/upstream/current/tools/lvdisplay.c	(original)
+++ lvm2/upstream/current/tools/lvdisplay.c	Fri Dec  2 18:56:38 2005
@@ -18,7 +18,8 @@
 static int _lvdisplay_single(struct cmd_context *cmd, struct logical_volume *lv,
 			     void *handle)
 {
-	if (!arg_count(cmd, all_ARG) && !(lv->status & VISIBLE_LV))
+	if (!arg_count(cmd, all_ARG) && !(lv->status & VISIBLE_LV) &&
+	    !(lv_is_cow(lv)))
 		return ECMD_PROCESSED;
 
 	if (arg_count(cmd, colon_ARG))