[SCSI] iscsi: add async notification of session events

This patch adds or modifies the transport class functions
used to notify userspace of session state events.

We modify the session addition up event and add a destruction event
to notify userspace of session creation, relogin and destruction.

And we modify the conn error event to be sent by broadcast
since multiple listeners may want to listen for it.

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

2 files changed, 8 insertions, 18 deletions

diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h
index 8813f0f4c624..55ebf035e620 100644
--- a/include/scsi/iscsi_if.h
+++ b/include/scsi/iscsi_if.h
@@ -53,6 +53,7 @@ enum iscsi_uevent_e {
         ISCSI_KEVENT_RECV_PDU           = KEVENT_BASE + 1,
         ISCSI_KEVENT_CONN_ERROR         = KEVENT_BASE + 2,
         ISCSI_KEVENT_IF_ERROR           = KEVENT_BASE + 3,
+        ISCSI_KEVENT_DESTROY_SESSION    = KEVENT_BASE + 4,
 };
 
 enum iscsi_tgt_dscvr {
@@ -157,27 +158,13 @@ struct iscsi_uevent {
                         uint32_t        cid;
                         uint32_t        error; /* enum iscsi_err */
                 } connerror;
+                struct msg_session_destroyed {
+                        uint32_t        host_no;
+                        uint32_t        sid;
+                } d_session;
                 struct msg_transport_connect_ret {
                         uint64_t        handle;
                 } ep_connect_ret;
-                struct msg_tgt_dscvr_ret {
-                        /*
-                         * session/connection pair used to reference
-                         * the connection to server
-                         */
-                        uint32_t        sid;
-                        uint32_t        cid;
-                        union {
-                                struct isns {
-                                        /* port # for conn to iSNS server */
-                                        uint16_t isns_port;
-                                        /* listening port to receive SCNs */
-                                        uint16_t scn_port;
-                                        /* listening port to receive ESIs */
-                                        uint16_t esi_port;
-                                } isns_attrib;
-                        } u;
-                } tgt_dscvr_ret;
         } r;
 } __attribute__ ((aligned (sizeof(uint64_t))));
 
diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h
index f7b0db5f2f5b..5a3df1d7085f 100644
--- a/include/scsi/scsi_transport_iscsi.h
+++ b/include/scsi/scsi_transport_iscsi.h
@@ -214,6 +214,8 @@ extern struct iscsi_cls_session *iscsi_alloc_session(struct Scsi_Host *shost,
                                         struct iscsi_transport *transport);
 extern int iscsi_add_session(struct iscsi_cls_session *session,
                              unsigned int target_id);
+extern int iscsi_if_create_session_done(struct iscsi_cls_conn *conn);
+extern int iscsi_if_destroy_session_done(struct iscsi_cls_conn *conn);
 extern struct iscsi_cls_session *iscsi_create_session(struct Scsi_Host *shost,
                                                 struct iscsi_transport *t,
                                                 unsigned int target_id);
@@ -226,4 +228,5 @@ extern int iscsi_destroy_conn(struct iscsi_cls_conn *conn);
 extern void iscsi_unblock_session(struct iscsi_cls_session *session);
 extern void iscsi_block_session(struct iscsi_cls_session *session);
 
+
 #endif