rpms/dmraid/devel dmraid-1.0.0.rc15-rm_partitions.patch, 1.1, 1.2 dmraid.spec, 1.91, 1.92

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/dmraid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22544

Modified Files:
	dmraid-1.0.0.rc15-rm_partitions.patch dmraid.spec 
Log Message:
* Fri Feb 13 2009 Hans de Goede <hdegoede at redhat.com> - 1.0.0.rc15-5
- Make --rm_partitions work with older kernels which return EINVAL when trying
  to remove a partition with a number > 16
- Document --rm_partitions in the man page


dmraid-1.0.0.rc15-rm_partitions.patch:

Index: dmraid-1.0.0.rc15-rm_partitions.patch
===================================================================
RCS file: /cvs/extras/rpms/dmraid/devel/dmraid-1.0.0.rc15-rm_partitions.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dmraid-1.0.0.rc15-rm_partitions.patch	12 Feb 2009 13:02:13 -0000	1.1
+++ dmraid-1.0.0.rc15-rm_partitions.patch	13 Feb 2009 11:13:27 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up 1.0.0.rc15/include/dmraid/lib_context.h.rmparts 1.0.0.rc15/include/dmraid/lib_context.h
 --- 1.0.0.rc15/include/dmraid/lib_context.h.rmparts	2008-06-20 16:17:35.000000000 +0200
-+++ 1.0.0.rc15/include/dmraid/lib_context.h	2009-02-11 14:27:36.000000000 +0100
++++ 1.0.0.rc15/include/dmraid/lib_context.h	2009-02-13 12:03:57.000000000 +0100
 @@ -169,6 +169,7 @@ enum action {
  	PARTCHAR = 0x20000000,
  
@@ -11,7 +11,7 @@
  /* Arguments allowed ? */
 diff -up 1.0.0.rc15/lib/Makefile.in.rmparts 1.0.0.rc15/lib/Makefile.in
 --- 1.0.0.rc15/lib/Makefile.in.rmparts	2008-06-11 15:07:04.000000000 +0200
-+++ 1.0.0.rc15/lib/Makefile.in	2009-02-11 14:27:36.000000000 +0100
++++ 1.0.0.rc15/lib/Makefile.in	2009-02-13 12:03:57.000000000 +0100
 @@ -12,6 +12,7 @@ SOURCES=\
  	activate/activate.c \
  	activate/devmapper.c \
@@ -22,7 +22,7 @@
  	display/display.c \
 diff -up 1.0.0.rc15/lib/device/dev-io.h.rmparts 1.0.0.rc15/lib/device/dev-io.h
 --- 1.0.0.rc15/lib/device/dev-io.h.rmparts	2008-06-12 12:54:32.000000000 +0200
-+++ 1.0.0.rc15/lib/device/dev-io.h	2009-02-11 14:27:36.000000000 +0100
++++ 1.0.0.rc15/lib/device/dev-io.h	2009-02-13 12:03:57.000000000 +0100
 @@ -19,5 +19,6 @@
  
  int discover_devices(struct lib_context *lc, char **devnodes);
@@ -31,9 +31,9 @@
  
  #endif
 diff -up /dev/null 1.0.0.rc15/lib/device/partition.c
---- /dev/null	2009-02-11 10:38:05.405006793 +0100
-+++ 1.0.0.rc15/lib/device/partition.c	2009-02-11 14:27:36.000000000 +0100
-@@ -0,0 +1,58 @@
+--- /dev/null	2009-02-13 08:38:43.364262886 +0100
++++ 1.0.0.rc15/lib/device/partition.c	2009-02-13 12:03:57.000000000 +0100
+@@ -0,0 +1,59 @@
 +/*
 + * Copyright (C) 2009  Hans de Goede <hdegoede at redhat.com>, Red Hat Inc.
 + *                     All rights reserved.
@@ -65,7 +65,8 @@
 +
 +		/* There is no way to enumerate partitions */
 +		for (part.pno = 1; part.pno <= 256; part.pno++) {
-+			if (ioctl(fd, BLKPG, &io) < 0 && errno != ENXIO)
++			if (ioctl(fd, BLKPG, &io) < 0 && errno != ENXIO &&
++					(part.pno < 16 || errno != EINVAL))
 +				LOG_ERR(lc, 0,
 +					"removing part %d from %s: %s\n",
 +					part.pno, rd->di->path,
@@ -93,8 +94,8 @@
 +	return _remove_subset_partitions(lc, rs);
 +}
 diff -up 1.0.0.rc15/lib/metadata/metadata.c.rmparts 1.0.0.rc15/lib/metadata/metadata.c
---- 1.0.0.rc15/lib/metadata/metadata.c.rmparts	2009-02-11 15:29:29.000000000 +0100
-+++ 1.0.0.rc15/lib/metadata/metadata.c	2009-02-11 15:30:32.000000000 +0100
+--- 1.0.0.rc15/lib/metadata/metadata.c.rmparts	2008-09-17 14:58:31.000000000 +0200
++++ 1.0.0.rc15/lib/metadata/metadata.c	2009-02-13 12:03:57.000000000 +0100
 @@ -2147,6 +2147,9 @@ lib_perform(struct lib_context *lc, enum
  	if (get_metadata(lc, action, p, argv))
  		ret = p->post(lc, p->pre ? p->pre(p->arg) : p->arg);
@@ -105,9 +106,33 @@
  	if (LOCK == p->lock)
  		unlock_resource(lc, NULL);
  
+diff -up 1.0.0.rc15/man/dmraid.8.rmparts 1.0.0.rc15/man/dmraid.8
+--- 1.0.0.rc15/man/dmraid.8.rmparts	2008-06-11 15:07:20.000000000 +0200
++++ 1.0.0.rc15/man/dmraid.8	2009-02-13 12:10:11.000000000 +0100
+@@ -8,6 +8,7 @@ dmraid \- discover, configure and activa
+  [-f|--format FORMAT[,FORMAT...]]
+  [{-P|--partchar} CHAR]
+  [-p|--no_partitions]
++ [-Z|--rm_partitions]
+  [--separator SEPARATOR]
+  [-t|--test]
+  [RAID-set...]
+@@ -110,7 +111,11 @@ In case metadata format handlers are cho
+ Useful if devices have multiple metadata signatures.
+ When activating RAID sets,
+ .B -p
+-disables the activation of partitions on them.
++disables the activation of partitions on them, and
++.B -Z
++will make dmraid tell the kernel to remove the partitions from the disks
++underlying the set, ie if sda is part of the set, remove sda1, sda2, etc.
++This prevents applications from directly accessiong the disks bypassing dmraid.
+ RAID set names given on command line don't need to be fully specified
+ (eg, "dmraid -ay sil" would activate all discovered Silicon Image Medley
+ RAID sets).
 diff -up 1.0.0.rc15/tools/commands.c.rmparts 1.0.0.rc15/tools/commands.c
 --- 1.0.0.rc15/tools/commands.c.rmparts	2008-06-20 22:25:33.000000000 +0200
-+++ 1.0.0.rc15/tools/commands.c	2009-02-11 14:27:36.000000000 +0100
++++ 1.0.0.rc15/tools/commands.c	2009-02-13 12:03:57.000000000 +0100
 @@ -38,7 +38,7 @@ static char const *short_opts = "a:hipP:
  #endif
  	"rR:s::tv"


Index: dmraid.spec
===================================================================
RCS file: /cvs/extras/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- dmraid.spec	12 Feb 2009 13:02:13 -0000	1.91
+++ dmraid.spec	13 Feb 2009 11:13:28 -0000	1.92
@@ -1,7 +1,7 @@
 Summary: Device-mapper RAID tool and library
 Name: dmraid
 Version: 1.0.0.rc15
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
@@ -91,6 +91,11 @@
 %attr(755,root,root) %{_libdir}/libdmraid.so.*
 
 %changelog
+* Fri Feb 13 2009 Hans de Goede <hdegoede at redhat.com> - 1.0.0.rc15-5
+- Make --rm_partitions work with older kernels which return EINVAL when trying
+  to remove a partition with a number > 16
+- Document --rm_partitions in the man page
+
 * Thu Feb 12 2009 Hans de Goede <hdegoede at redhat.com> - 1.0.0.rc15-4
 - Add patch adding --rm_partitions cmdline option and functionality (#484845)