1 files changed, 35 insertions, 5 deletions

diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h
index cbf7e58bd6f9..401192e56e50 100644
--- a/include/scsi/libiscsi.h
+++ b/include/scsi/libiscsi.h
@@ -60,6 +60,7 @@ struct iscsi_nopin;
 #define TMABORT_SUCCESS                 0x1
 #define TMABORT_FAILED                  0x2
 #define TMABORT_TIMEDOUT                0x3
+#define TMABORT_NOT_FOUND               0x4
 
 /* Connection suspend "bit" */
 #define ISCSI_SUSPEND_BIT               1
@@ -83,6 +84,12 @@ struct iscsi_mgmt_task {
         struct list_head        running;
 };
 
+enum {
+        ISCSI_TASK_COMPLETED,
+        ISCSI_TASK_PENDING,
+        ISCSI_TASK_RUNNING,
+};
+
 struct iscsi_cmd_task {
         /*
          * Becuae LLDs allocate their hdr differently, this is a pointer to
@@ -95,12 +102,17 @@ struct iscsi_cmd_task {
         uint32_t                unsol_datasn;
         int                     imm_count;      /* imm-data (bytes)   */
         int                     unsol_count;    /* unsolicited (bytes)*/
+        /* offset in unsolicited stream (bytes); */
+        int                     unsol_offset;
         int                     data_count;     /* remaining Data-Out */
         struct scsi_cmnd        *sc;            /* associated SCSI cmd*/
         int                     total_length;
         struct iscsi_conn       *conn;          /* used connection    */
         struct iscsi_mgmt_task  *mtask;         /* tmf mtask in progr */
 
+        /* state set/tested under session->lock */
+        int                     state;
+        atomic_t                refcount;
         struct list_head        running;        /* running cmd list */
         void                    *dd_data;       /* driver/transport data */
 };
@@ -126,6 +138,14 @@ struct iscsi_conn {
         int                     id;             /* CID */
         struct list_head        item;           /* maintains list of conns */
         int                     c_stage;        /* connection state */
+        /*
+         * Preallocated buffer for pdus that have data but do not
+         * originate from scsi-ml. We never have two pdus using the
+         * buffer at the same time. It is only allocated to
+         * the default max recv size because the pdus we support
+         * should always fit in this buffer
+         */
+        char                    *data;
         struct iscsi_mgmt_task  *login_mtask;   /* mtask used for login/text */
         struct iscsi_mgmt_task  *mtask;         /* xmit mtask in progress */
         struct iscsi_cmd_task   *ctask;         /* xmit ctask in progress */
@@ -134,7 +154,7 @@ struct iscsi_conn {
         struct kfifo            *immqueue;      /* immediate xmit queue */
         struct kfifo            *mgmtqueue;     /* mgmt (control) xmit queue */
         struct list_head        mgmt_run_list;  /* list of control tasks */
-        struct kfifo            *xmitqueue;     /* data-path cmd queue */
+        struct list_head        xmitqueue;      /* data-path cmd queue */
         struct list_head        run_list;       /* list of cmds in progress */
         struct work_struct      xmitwork;       /* per-conn. xmit workqueue */
         /*
@@ -157,6 +177,11 @@ struct iscsi_conn {
         int                     max_xmit_dlength; /* target_max_recv_dsl */
         int                     hdrdgst_en;
         int                     datadgst_en;
+        int                     ifmarker_en;
+        int                     ofmarker_en;
+        /* values userspace uses to id a conn */
+        int                     persistent_port;
+        char                    *persistent_address;
 
         /* MIB-statistics */
         uint64_t                txdata_octets;
@@ -196,8 +221,8 @@ struct iscsi_session {
         int                     pdu_inorder_en;
         int                     dataseq_inorder_en;
         int                     erl;
-        int                     ifmarker_en;
-        int                     ofmarker_en;
+        int                     tpgt;
+        char                    *targetname;
 
         /* control data */
         struct iscsi_transport  *tt;
@@ -240,6 +265,10 @@ iscsi_session_setup(struct iscsi_transport *, struct scsi_transport_template *,
 extern void iscsi_session_teardown(struct iscsi_cls_session *);
 extern struct iscsi_session *class_to_transport_session(struct iscsi_cls_session *);
 extern void iscsi_session_recovery_timedout(struct iscsi_cls_session *);
+extern int iscsi_set_param(struct iscsi_cls_conn *cls_conn,
+                           enum iscsi_param param, char *buf, int buflen);
+extern int iscsi_session_get_param(struct iscsi_cls_session *cls_session,
+                                   enum iscsi_param param, char *buf);
 
 #define session_to_cls(_sess) \
         hostdata_session(_sess->host->hostdata)
@@ -255,6 +284,8 @@ 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 int iscsi_conn_get_param(struct iscsi_cls_conn *cls_conn,
+                                enum iscsi_param param, char *buf);
 
 /*
  * pdu and task processing
@@ -262,8 +293,7 @@ extern void iscsi_conn_failure(struct iscsi_conn *conn, enum iscsi_err err);
 extern int iscsi_check_assign_cmdsn(struct iscsi_session *,
                                     struct iscsi_nopin *);
 extern void iscsi_prep_unsolicit_data_pdu(struct iscsi_cmd_task *,
-                                        struct iscsi_data *hdr,
-                                        int transport_data_cnt);
+                                        struct iscsi_data *hdr);
 extern int iscsi_conn_send_pdu(struct iscsi_cls_conn *, struct iscsi_hdr *,
                                 char *, uint32_t);
 extern int iscsi_complete_pdu(struct iscsi_conn *, struct iscsi_hdr *,