rpms/lvm2/devel lvm2-2.02.14-space_check.patch, NONE, 1.1 lvm2.spec, 1.85, 1.86

[fedora-cvs-commits at redhat.com]

Author: agk

Update of /cvs/dist/rpms/lvm2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23535

Modified Files:
	lvm2.spec 
Added Files:
	lvm2-2.02.14-space_check.patch 
Log Message:
Fix high-level free-space check on partial allocation.


lvm2-2.02.14-space_check.patch:
 WHATS_NEW               |    4 ++++
 lib/metadata/lv_manip.c |    6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE lvm2-2.02.14-space_check.patch ---
--- LVM2.2.02.13/lib/metadata/lv_manip.c	2006-10-23 16:54:51.000000000 +0100
+++ LVM2.2.02.13-2/lib/metadata/lv_manip.c	2006-10-30 16:10:41.000000000 +0000
@@ -894,10 +894,10 @@
 
 	/* Is there enough total space? */
 	free_pes = pv_maps_size(pvms);
-	if (needed > free_pes) {
+	if (needed - *allocated > free_pes) {
 		log_error("Insufficient free space: %" PRIu32 " extents needed,"
-			  " but only %" PRIu32 " available", needed,
-			  free_pes);
+			  " but only %" PRIu32 " available",
+			  needed - *allocated, free_pes);
 		return 0;
 	}
 
--- LVM2.2.02.13/WHATS_NEW	2006-10-27 16:21:07.000000000 +0100
+++ LVM2.2.02.13-2/WHATS_NEW	2006-10-30 16:11:53.000000000 +0000
@@ -1,3 +1,7 @@
+Version 2.02.14 - 
+===================================
+  Fix high-level free space check for partial allocations.
+  
 Version 2.02.13 - 27th October 2006
 ===================================
   Add couple of missing files to tools/Makefile CLEAN_TARGETS.


Index: lvm2.spec
===================================================================
RCS file: /cvs/dist/rpms/lvm2/devel/lvm2.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- lvm2.spec	27 Oct 2006 15:30:24 -0000	1.85
+++ lvm2.spec	30 Oct 2006 16:23:26 -0000	1.86
@@ -3,13 +3,14 @@
 Summary: Userland logical volume management tools 
 Name: lvm2
 Version: 2.02.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
 Source0: LVM2.%{version}.tgz
 Patch0: clvmd-init-chkconfig.patch
 Patch1: cluster-locking-built-in.patch
+Patch2: lvm2-2.02.14-space_check.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: device-mapper >= %{device_mapper_version}
 BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel
@@ -36,6 +37,8 @@
 %patch -p1 -b .chkconfig
 %patch1 -p1 -b .locking
 
+%patch2 -p1 -b .space_check
+
 %build
 %configure --enable-static_link --enable-readline --enable-lvm1_fallback --with-clvmd=cman --with-cluster=internal --with-pool=internal --with-staticdir=/sbin --with-user= --with-group=
 make DESTDIR=$RPM_BUILD_ROOT
@@ -116,6 +119,10 @@
 
 
 %changelog
+* Mon Oct 30 2006 Alasdair Kergon <agk at redhat.com> - 2.02.13-2
+- Fix high-level free-space check on partial allocation.
+  Resolves: #212774
+
 * Fri Oct 27 2006 Alasdair Kergon <agk at redhat.com> - 2.02.13-1
 - New upstream - see WHATS_NEW.
   Resolves: #205818