From 88eccf2938b7ea502d7ebe109bc6442bab3c9713 Mon Sep 17 00:00:00 2001
From: Mike Christie <michaelc@cs.wisc.edu>
Date: Thu, 5 Mar 2009 14:46:05 -0600
Subject: [PATCH] --- yaml --- r: 136319 b: refs/heads/master c:
 40a06e755d8524cd0b24f795e8bdce5ad19fc41b h: refs/heads/master i:   136317:
 fa3d369ee2c9b45d415d10a443efbf4e61ce6d85   136315:
 505f60a0777aa1f8716e6a8b284adcb092f86e04   136311:
 d15f930e0ec1bf29f4f484eeb2dfc0ca77d58bb3   136303:
 d372f23805863ff0ab89a9219f172092262fbda2   136287:
 7697ce250bb7b848ffa4c759619b4b262fa354b3   136255:
 02c7edfe4d2ff718beefa6b765435d98db0e6130   136191:
 f749f044fbaadf323e1460f6ca61fea5bbb127fe v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/scsi/libiscsi.c | 5 ++---
 trunk/include/scsi/libiscsi.h | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 143e30647b4b..78f3163f7d35 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d1083509a69a36cc1394f188b7b8956e5526a16
+refs/heads/master: 40a06e755d8524cd0b24f795e8bdce5ad19fc41b
diff --git a/trunk/drivers/scsi/libiscsi.c b/trunk/drivers/scsi/libiscsi.c
index d12f9794fcd0..d07017911139 100644
--- a/trunk/drivers/scsi/libiscsi.c
+++ b/trunk/drivers/scsi/libiscsi.c
@@ -1069,10 +1069,9 @@ struct iscsi_task *iscsi_itt_to_ctask(struct iscsi_conn *conn, itt_t itt)
 }
 EXPORT_SYMBOL_GPL(iscsi_itt_to_ctask);
 
-void iscsi_session_failure(struct iscsi_cls_session *cls_session,
+void iscsi_session_failure(struct iscsi_session *session,
 			   enum iscsi_err err)
 {
-	struct iscsi_session *session = cls_session->dd_data;
 	struct iscsi_conn *conn;
 	struct device *dev;
 	unsigned long flags;
@@ -2097,7 +2096,7 @@ EXPORT_SYMBOL_GPL(iscsi_host_alloc);
 
 static void iscsi_notify_host_removed(struct iscsi_cls_session *cls_session)
 {
-	iscsi_session_failure(cls_session, ISCSI_ERR_INVALID_HOST);
+	iscsi_session_failure(cls_session->dd_data, ISCSI_ERR_INVALID_HOST);
 }
 
 /**
diff --git a/trunk/include/scsi/libiscsi.h b/trunk/include/scsi/libiscsi.h
index 84eded91b945..7ffaed2f94dd 100644
--- a/trunk/include/scsi/libiscsi.h
+++ b/trunk/include/scsi/libiscsi.h
@@ -378,7 +378,7 @@ extern void iscsi_conn_stop(struct iscsi_cls_conn *, int);
 extern int iscsi_conn_bind(struct iscsi_cls_session *, struct iscsi_cls_conn *,
 			   int);
 extern void iscsi_conn_failure(struct iscsi_conn *conn, enum iscsi_err err);
-extern void iscsi_session_failure(struct iscsi_cls_session *cls_session,
+extern void iscsi_session_failure(struct iscsi_session *session,
 				  enum iscsi_err err);
 extern int iscsi_conn_get_param(struct iscsi_cls_conn *cls_conn,
 				enum iscsi_param param, char *buf);