rpms/device-mapper-multipath/devel fix_kpartx.patch, NONE, 1.1 device-mapper-multipath.spec, 1.53, 1.54

[Milan Broz]

Author: mbroz

Update of /cvs/pkgs/rpms/device-mapper-multipath/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23606

Modified Files:
	device-mapper-multipath.spec 
Added Files:
	fix_kpartx.patch 
Log Message:
Fix kpartx extended partition handling.
Resolves: #475283



fix_kpartx.patch:

--- NEW FILE fix_kpartx.patch ---
--- multipath-tools.old/kpartx/kpartx.c	2008-07-23 22:49:52.000000000 +0200
+++ multipath-tools/kpartx/kpartx.c	2009-03-06 13:32:49.000000000 +0100
@@ -474,6 +474,7 @@ main(int argc, char **argv){
 			d = c;
 			while (c) {
 				for (j = 0; j < n; j++) {
+					uint64_t start;
 					int k = slices[j].container - 1;
 
 					if (slices[j].size == 0)
@@ -484,7 +485,7 @@ main(int argc, char **argv){
 						continue;
 
 					/* Skip all simple slices */
-					if (k < 0)
+					if (slices[j].container == 0)
 						continue;
 
 					/* Check container slice */
@@ -499,10 +500,11 @@ main(int argc, char **argv){
 					}
 					strip_slash(partname);
 
+					start = slices[j].start - slices[k].start;
 					if (safe_sprintf(params, "%d:%d %" PRIu64,
 							 slices[k].major,
 							 slices[k].minor,
-							 slices[j].start)) {
+							 start)) {
 						fprintf(stderr, "params too small\n");
 						exit(1);
 					}


Index: device-mapper-multipath.spec
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- device-mapper-multipath.spec	24 Feb 2009 11:34:23 -0000	1.53
+++ device-mapper-multipath.spec	6 Mar 2009 12:53:14 -0000	1.54
@@ -1,7 +1,7 @@
 Summary: Tools to manage multipath devices using device-mapper
 Name: device-mapper-multipath
 Version: 0.4.8
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
@@ -19,6 +19,7 @@
 Patch10: fix_devt.patch
 Patch11: directio_message_cleanup.patch
 Patch12: binding_error.patch
+Patch13: fix_kpartx.patch
 Requires: kpartx = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): chkconfig
@@ -58,6 +59,7 @@
 %patch10 -p1 -b .fix_devt
 %patch11 -p1 -b .directio_message
 %patch12 -p1 -b .binding_error
+%patch13 -p1 -b .ext_part
 
 %build
 make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT
@@ -109,6 +111,9 @@
 %{_mandir}/man8/kpartx.8.gz
 
 %changelog
+* Fri Mar 6 2009 Milan Broz <mbroz at redhat.com> - 0.4.8-9
+- Fix kpartx extended partition handling (475283)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.8-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild