Attachment 308818 Details for Bug 450694 – Backported fix

[patch] Backported fix

iprutils-no-restore-preferred-primary.patch (text/plain), 2.02 KB, created by Bryn M. Reeves on 2008-06-10 14:19:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bryn M. Reeves

Created: 2008-06-10 14:19:10 UTC

Size: 2.02 KB

patch

obsolete

>diff -up iprutils/iprlib.c.preferred-primary iprutils/iprlib.c
>--- iprutils/iprlib.c.preferred-primary	2008-06-10 15:17:08.000000000 +0100
>+++ iprutils/iprlib.c	2008-06-10 15:17:25.000000000 +0100
>@@ -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 @@ int set_preferred_primary(struct ipr_ioa
> 	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 @@ int ipr_modify_ioa_attr(struct ipr_ioa *
> 	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 @@ int ipr_set_ioa_attr(struct ipr_ioa *ioa
> 		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) {
>diff -up iprutils/iprlib.h.preferred-primary iprutils/iprlib.h
>--- iprutils/iprlib.h.preferred-primary	2008-06-10 15:17:13.000000000 +0100
>+++ iprutils/iprlib.h	2008-06-10 15:17:25.000000000 +0100
>@@ -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 @@ struct ipr_mode_page_28_scsi_dev_bus_att
> #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"

Actions: View | Diff

Attachments on bug 450694: 308816 | 308818