LVM2 ./WHATS_NEW lib/cache/lvmcache.c

[agk@sourceware.org]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2006-06-14 20:11:23

Modified files:
	.              : WHATS_NEW 
	lib/cache      : lvmcache.c 

Log message:
	Fix PV tools to include orphaned PVs in default output again.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.402&r2=1.403
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/cache/lvmcache.c.diff?cvsroot=lvm2&r1=1.26&r2=1.27

--- LVM2/WHATS_NEW	2006/06/12 17:34:20	1.402
+++ LVM2/WHATS_NEW	2006/06/14 20:11:22	1.403
@@ -1,5 +1,7 @@
 Version 2.02.07 - 
 =================================
+  Fix PV tools to include orphaned PVs in default output again.
+  Fixed unaligned access when using clvm.
   Fix an extra dev_close in a label_read error path.
   Append patches to commit emails.
   Fix target_register_events args.
@@ -13,7 +15,6 @@
   Add 'Completed' debug message.
   Don't attempt library exit after reloading config files.
   Always compile with libdevmapper, even if device-mapper is disabled.
-  Fixed unaligned access when using clvm.
 
 Version 2.02.06 - 12th May 2006
 ===============================
--- LVM2/lib/cache/lvmcache.c	2006/05/11 17:58:58	1.26
+++ LVM2/lib/cache/lvmcache.c	2006/06/14 20:11:22	1.27
@@ -169,14 +169,18 @@
 const char *vgname_from_vgid(struct dm_pool *mem, const char *vgid)
 {
 	struct lvmcache_vginfo *vginfo;
+	const char *vgname = NULL;
 
-	if ((vginfo = vginfo_from_vgid(vgid))) {
-		if (mem)
-			return dm_pool_strdup(mem, vginfo->vgname);
-		return vginfo->vgname;
-	}
+	if (!*vgid)
+		vgname = ORPHAN;
 
-	return NULL;
+	if ((vginfo = vginfo_from_vgid(vgid)))
+		vgname = vginfo->vgname;
+
+	if (mem && vgname)
+		return dm_pool_strdup(mem, vgname);
+
+	return vgname;
 }
 
 struct lvmcache_info *info_from_pvid(const char *pvid)