rpms/dmraid/devel avoid_register.patch, NONE, 1.1 dmraid.spec, 1.113, 1.114

[Heinz Mauelshagen]

Author: mauelsha

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

Modified Files:
	dmraid.spec 
Added Files:
	avoid_register.patch 
Log Message:
bz543101: avoid (un)registering devices if no metadata format handler support

avoid_register.patch:
 activate.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE avoid_register.patch ---
diff --git a/lib/activate/activate.c.avoid_register b/lib/activate/activate.c
index 1d71ea8..86882f7 100644
--- a/lib/activate/activate.c.avoid_register
+++ b/lib/activate/activate.c
@@ -964,11 +964,13 @@ activate_subset(struct lib_context *lc, struct raid_set *rs, enum dm_what what)
 {
 	int ret = 0;
 	char *table = NULL;
+	struct dmraid_format *fmt = get_format(rs);
 
 	if (T_GROUP(rs))
 		return 1;
 
-	if (what == DM_REGISTER)
+	if (what == DM_REGISTER &&
+	    fmt->metadata_handler)
 		return register_devices(lc, rs);
 
 	/* Call type handler */
@@ -1053,8 +1055,10 @@ deactivate_superset(struct lib_context *lc, struct raid_set *rs,
 		    enum dm_what what)
 {
 	int ret = 1, status;
+	struct dmraid_format *fmt = get_format(rs);
 
-	if (what == DM_REGISTER)
+	if (what == DM_REGISTER &&
+	    fmt->metadata_handler)
 		return unregister_devices(lc, rs);
 
 	status = dm_status(lc, rs);


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/devel/dmraid.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- dmraid.spec	1 Dec 2009 13:34:01 -0000	1.113
+++ dmraid.spec	7 Dec 2009 16:23:48 -0000	1.114
@@ -7,7 +7,7 @@
 Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
 Version: 1.0.0.rc16
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
@@ -28,6 +28,7 @@ Patch1: ddf1_lsi_persistent_name.patch
 Patch2: pdc_raid10_failure.patch
 Patch3: return_error_wo_disks.patch
 Patch4: fix_sil_jbod.patch
+Patch5: avoid_register.patch
 
 %description
 DMRAID supports RAID device discovery, RAID set activation, creation,
@@ -72,6 +73,7 @@ Device failure reporting has to be activ
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %define _libdir /%{_lib}