[SCSI] iscsi: fix command requeues during iscsi recovery

Do not flush queues then block session. This will cause commands
to needlessly swing around on us and remove goofy
recovery_failed field and replace with state value.

And do not start recovery from within the host reset function.
This causeis too many problems becuase open-iscsi was desinged to
call out to userspace then have userpscae decide if we should
go into recovery or kill the session.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

2 files changed, 2 insertions, 3 deletions

diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h
index 2dba929a2a..17b28f08b6 100644
--- a/include/scsi/libiscsi.h
+++ b/include/scsi/libiscsi.h
@@ -210,7 +210,6 @@ struct iscsi_session {
                                                  * - mgmtpool,             *
                                                  * - r2tpool               */
         int                     state;          /* session state           */
-        int                     recovery_failed;
         struct list_head        item;
         int                     conn_cnt;
         int                     age;            /* counts session re-opens */
@@ -241,8 +240,6 @@ iscsi_session_setup(struct iscsi_transport *, struct scsi_transport_template *,
                     int, int, uint32_t, uint32_t *);
 extern void iscsi_session_teardown(struct iscsi_cls_session *);
 extern struct iscsi_session *class_to_transport_session(struct iscsi_cls_session *);
-extern void iscsi_start_session_recovery(struct iscsi_session *,
-                                        struct iscsi_conn *, int);
 extern void iscsi_session_recovery_timedout(struct iscsi_cls_session *);
 
 #define session_to_cls(_sess) \
diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h
index c9e9475c6d..92129b97d3 100644
--- a/include/scsi/scsi_transport_iscsi.h
+++ b/include/scsi/scsi_transport_iscsi.h
@@ -173,6 +173,8 @@ struct iscsi_cls_conn {
 #define ISCSI_STATE_LOGGED_IN           2
 #define ISCSI_STATE_FAILED              3
 #define ISCSI_STATE_TERMINATE           4
+#define ISCSI_STATE_IN_RECOVERY         5
+#define ISCSI_STATE_RECOVERY_FAILED     6
 
 struct iscsi_cls_session {
         struct list_head sess_list;             /* item in session_list */