Mercurial > illumos > illumos-gate

changeset 9712:d0f85f328e5b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6840554 Boot session shouldn't be reconfigured if MPxIO is not enabled 6842584 set the default status of iscsi initiator service to enabled in case of iscsi boot
author Jack Meng <Jack.Meng@Sun.COM>
date Sat, 23 May 2009 14:31:05 +0800
parents d309660fd989
children 7146b58ba290
files usr/src/uts/common/io/scsi/adapters/iscsi/iscsi.c usr/src/uts/common/io/scsi/adapters/iscsi/iscsid.c
diffstat 2 files changed, 14 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/common/io/scsi/adapters/iscsi/iscsi.c	Fri May 22 19:48:28 2009 -0700
+++ b/usr/src/uts/common/io/scsi/adapters/iscsi/iscsi.c	Sat May 23 14:31:05 2009 +0800
@@ -425,7 +425,13 @@
 			ihp->hba_sig	= ISCSI_SIG_HBA;
 			ihp->hba_tran	= tran;
 			ihp->hba_dip	= dip;
-			ihp->hba_service_status = ISCSI_SERVICE_DISABLED;
+			if (iscsiboot_prop == NULL) {
+				ihp->hba_service_status =
+				    ISCSI_SERVICE_DISABLED;
+			} else {
+				ihp->hba_service_status =
+				    ISCSI_SERVICE_ENABLED;
+			}
 			ihp->hba_service_client_count = 0;
 
 			mutex_enter(&iscsi_oid_mutex);
--- a/usr/src/uts/common/io/scsi/adapters/iscsi/iscsid.c	Fri May 22 19:48:28 2009 -0700
+++ b/usr/src/uts/common/io/scsi/adapters/iscsi/iscsid.c	Sat May 23 14:31:05 2009 +0800
@@ -2315,11 +2315,13 @@
 			}
 			if ((ihp->hba_persistent_loaded == B_TRUE) &&
 			    (reconfigured == B_FALSE)) {
-				(void) iscsi_reconfig_boot_sess(ihp);
-				iscsid_poke_discovery(ihp,
-				    iSCSIDiscoveryMethodUnknown);
-				(void) iscsid_login_tgt(ihp, NULL,
-				    iSCSIDiscoveryMethodUnknown, NULL);
+				if (iscsi_chk_bootlun_mpxio(ihp) == B_TRUE) {
+					(void) iscsi_reconfig_boot_sess(ihp);
+					iscsid_poke_discovery(ihp,
+					    iSCSIDiscoveryMethodUnknown);
+					(void) iscsid_login_tgt(ihp, NULL,
+					    iSCSIDiscoveryMethodUnknown, NULL);
+				}
 				reconfigured = B_TRUE;
 			}
 			break;