From 0e2ceed74df532fabc26555a08abf7ed5cd7bfef Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@redhat.com>
Date: Fri, 22 Feb 2008 13:22:21 +0000
Subject: [PATCH] Add missing no-longer-used segs_using_this_lv test to
 check_lv_segments.

---
 WHATS_NEW               | 15 ++++++++-------
 lib/metadata/lv_manip.c |  3 +++
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/WHATS_NEW b/WHATS_NEW
index 9c2e127b0..7c337edc7 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,17 +1,18 @@
 Version 2.02.34 -
 ===================================
-  Remove redundant if-before-free tests in clvmd.c.
-  Avoid a compiler warning: make is_orphan's parameter "const".
+  Add missing no-longer-used segs_using_this_lv test to check_lv_segments.
+  Remove redundant non-NULL tests before calling free in clvmd.c.
+  Avoid a compiler warning: make is_orphan's parameter const.
   Fix lvconvert detection of mirror conversion in progress. (2.02.30)
   Avoid automatic lvconvert polldaemon invocation when -R specified. (2.02.30)
   Fix 'pvs -a' to detect VGs of PVs without metadata areas.
   Divide up internal orphan volume group by format type.
   Update usage message for clvmd.
-  Fix clvmd man page printing <br>, clarified debug options.
-  Fix lvresize to support /dev/mapper prefix in the lvname
-  Fix unfilled paramater passed to fsadm from lvresize
-  Update fsadm to call lvresize if the partition size differs (with option -l)
-  Fix fsadm to support vg/lv name (like the rest of lv-tools)
+  Fix clvmd man page not to print <br> and clarified debug options.
+  Fix lvresize to support /dev/mapper prefix in the LV name.
+  Fix unfilled parameter passed to fsadm from lvresize.
+  Update fsadm to call lvresize if the partition size differs (with option -l).
+  Fix fsadm to support VG/LV names.
 
 Version 2.02.33 - 31st January 2008
 ===================================
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index eef39a7dd..40597ae54 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -2308,6 +2308,9 @@ int remove_layer_from_lv(struct logical_volume *lv,
 	    parent->le_count != layer_lv->le_count)
 		return_0;
 
+	if (!lv_empty(parent))
+		return_0;
+
 	if (!_move_lv_segments(parent, layer_lv, 0, 0))
 		return_0;