Attachment 308816 Details for Bug 450694 – Diff of changes between iprutils 2.2.8 & 2.2.9

[patch] Diff of changes between iprutils 2.2.8 & 2.2.9

iprutils-2.2.8_2.2.9.diff (text/plain), 3.49 KB, created by Bryn M. Reeves on 2008-06-10 14:13:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bryn M. Reeves

Created: 2008-06-10 14:13:47 UTC

Size: 3.49 KB

patch

obsolete

>Index: iprlib.c
>===================================================================
>RCS file: /cvsroot/iprdd/iprutils/iprlib.c,v
>retrieving revision 1.116
>retrieving revision 1.117
>diff -u -r1.116 -r1.117
>--- iprlib.c	4 Sep 2007 21:05:10 -0000	1.116
>+++ iprlib.c	9 Apr 2008 19:34:51 -0000	1.117
>@@ -10,7 +10,7 @@
>   */
> 
> /*
>- * $Header: /cvsroot/iprdd/iprutils/iprlib.c,v 1.116 2007/09/04 21:05:10 brking Exp $
>+ * $Header: /cvsroot/iprdd/iprutils/iprlib.c,v 1.117 2008/04/09 19:34:51 tsenglin Exp $
>  */
> 
> #ifndef iprlib_h
>@@ -3448,7 +3448,6 @@
> 	sprintf(temp, "%d", preferred_primary);
> 	if (ipr_set_preferred_primary(ioa, preferred_primary))
> 		return -EIO;
>-	ipr_save_ioa_attr(ioa, IPR_DA_PREFERRED_PRIMARY, temp, 1);
> 
> 	return 0;
> }
>@@ -4549,9 +4548,6 @@
> 	char temp[100];
> 	int rc;
> 
>-	rc = ipr_get_saved_ioa_attr(ioa, IPR_DA_PREFERRED_PRIMARY, temp);
>-	if (rc == RC_SUCCESS)
>-		sscanf(temp, "%d", &attr->preferred_primary);
> 	rc = ipr_get_saved_ioa_attr(ioa, IPR_GSCSI_HA_ONLY, temp);
> 	if (rc == RC_SUCCESS)
> 		sscanf(temp, "%d", &attr->gscsi_only_ha);
>@@ -4614,8 +4610,6 @@
> 		sprintf(temp, "%d", attr->preferred_primary);
> 		if (ipr_set_preferred_primary(ioa, attr->preferred_primary))
> 			return -EIO;
>-		if (save)
>-			ipr_save_ioa_attr(ioa, IPR_DA_PREFERRED_PRIMARY, temp, 1);
> 	}
> 
> 	if (attr->gscsi_only_ha != old_attr.gscsi_only_ha) {
>Index: iprlib.h
>===================================================================
>RCS file: /cvsroot/iprdd/iprutils/iprlib.h,v
>retrieving revision 1.99
>retrieving revision 1.100
>diff -u -r1.99 -r1.100
>--- iprlib.h	4 Sep 2007 21:05:11 -0000	1.99
>+++ iprlib.h	9 Apr 2008 19:34:17 -0000	1.100
>@@ -12,7 +12,7 @@
>  */
> 
> /*
>- * $Header: /cvsroot/iprdd/iprutils/iprlib.h,v 1.99 2007/09/04 21:05:11 brking Exp $
>+ * $Header: /cvsroot/iprdd/iprutils/iprlib.h,v 1.100 2008/04/09 19:34:17 tsenglin Exp $
>  */
> 
> #include <stdarg.h>
>@@ -957,7 +957,6 @@
> #define IPR_CONFIG_DIR "/etc/ipr/"
> 
> #define IPR_CATEGORY_IOA "Adapter"
>-#define IPR_DA_PREFERRED_PRIMARY "PREFERRED_PRIMARY"
> #define IPR_GSCSI_HA_ONLY "JBOD_ONLY_HA"
> 
> #define IPR_CATEGORY_BUS "Bus"
>Index: version.mk
>===================================================================
>RCS file: /cvsroot/iprdd/iprutils/version.mk,v
>retrieving revision 1.66
>retrieving revision 1.68
>diff -u -r1.66 -r1.68
>--- version.mk	20 Sep 2007 15:59:51 -0000	1.66
>+++ version.mk	9 Apr 2008 20:07:50 -0000	1.68
>@@ -6,9 +6,9 @@
> 
> IPR_MAJOR_RELEASE=2
> IPR_MINOR_RELEASE=2
>-IPR_FIX_LEVEL=8
>+IPR_FIX_LEVEL=9
> IPR_RELEASE=1
>-IPR_FIX_DATE=(September 20, 2007)
>+IPR_FIX_DATE=(April 9, 2008)
> 
> IPR_VERSION_STR=$(IPR_MAJOR_RELEASE).$(IPR_MINOR_RELEASE).$(IPR_FIX_LEVEL) $(IPR_FIX_DATE)
> 
>Index: spec/iprutils.spec
>===================================================================
>RCS file: /cvsroot/iprdd/iprutils/spec/iprutils.spec,v
>retrieving revision 1.88
>retrieving revision 1.89
>diff -u -r1.88 -r1.89
>--- spec/iprutils.spec	20 Sep 2007 15:59:51 -0000	1.88
>+++ spec/iprutils.spec	9 Apr 2008 19:55:20 -0000	1.89
>@@ -1,6 +1,6 @@
> Summary: Utilities for the IBM Power Linux RAID adapters
> Name: iprutils
>-Version: 2.2.8
>+Version: 2.2.9
> Release: 1
> License: CPL
> Group: System Environment/Base
>@@ -81,6 +81,10 @@
> %{_sysconfdir}/ha.d/resource.d/iprha
> 
> %changelog
>+* Thu Apr 09 2008 Tseng-Hui Lin <tsenglin@us.ibm.com> 2.2.9
>+- Release 2.2.9
>+- Do not save preferred primary attribute to fix an infinite failover
>+  problem in HA two system RAID configuration.
> * Thu Sep 20 2007 Brian King <brking@us.ibm.com> 2.2.8
> - Release 2.2.8
> * Mon Aug 27 2007 Brian King <brking@us.ibm.com>

Actions: View | Diff

Attachments on bug 450694: 308816 | 308818