4 files changed, 30 insertions, 35 deletions

diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index e19d92f2d753..dfaf9fa57340 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -1490,7 +1490,7 @@ iscsi_tcp_conn_create(struct iscsi_cls_session *cls_session, uint32_t conn_idx)
         struct iscsi_cls_conn *cls_conn;
         struct iscsi_tcp_conn *tcp_conn;
 
-        cls_conn = iscsi_conn_setup(cls_session, conn_idx);
+        cls_conn = iscsi_conn_setup(cls_session, sizeof(*tcp_conn), conn_idx);
         if (!cls_conn)
                 return NULL;
         conn = cls_conn->dd_data;
@@ -1500,18 +1500,14 @@ iscsi_tcp_conn_create(struct iscsi_cls_session *cls_session, uint32_t conn_idx)
          */
         conn->max_recv_dlength = ISCSI_DEF_MAX_RECV_SEG_LEN;
 
-        tcp_conn = kzalloc(sizeof(*tcp_conn), GFP_KERNEL);
-        if (!tcp_conn)
-                goto tcp_conn_alloc_fail;
-
-        conn->dd_data = tcp_conn;
+        tcp_conn = conn->dd_data;
         tcp_conn->iscsi_conn = conn;
 
         tcp_conn->tx_hash.tfm = crypto_alloc_hash("crc32c", 0,
                                                   CRYPTO_ALG_ASYNC);
         tcp_conn->tx_hash.flags = 0;
         if (IS_ERR(tcp_conn->tx_hash.tfm))
-                goto free_tcp_conn;
+                goto free_conn;
 
         tcp_conn->rx_hash.tfm = crypto_alloc_hash("crc32c", 0,
                                                   CRYPTO_ALG_ASYNC);
@@ -1523,14 +1519,12 @@ iscsi_tcp_conn_create(struct iscsi_cls_session *cls_session, uint32_t conn_idx)
 
 free_tx_tfm:
         crypto_free_hash(tcp_conn->tx_hash.tfm);
-free_tcp_conn:
+free_conn:
         iscsi_conn_printk(KERN_ERR, conn,
                           "Could not create connection due to crc32c "
                           "loading error. Make sure the crc32c "
                           "module is built as a module or into the "
                           "kernel\n");
-        kfree(tcp_conn);
-tcp_conn_alloc_fail:
         iscsi_conn_teardown(cls_conn);
         return NULL;
 }
@@ -1563,14 +1557,13 @@ iscsi_tcp_conn_destroy(struct iscsi_cls_conn *cls_conn)
         struct iscsi_tcp_conn *tcp_conn = conn->dd_data;
 
         iscsi_tcp_release_conn(conn);
-        iscsi_conn_teardown(cls_conn);
 
         if (tcp_conn->tx_hash.tfm)
                 crypto_free_hash(tcp_conn->tx_hash.tfm);
         if (tcp_conn->rx_hash.tfm)
                 crypto_free_hash(tcp_conn->rx_hash.tfm);
 
-        kfree(tcp_conn);
+        iscsi_conn_teardown(cls_conn);
 }
 
 static void
@@ -1983,8 +1976,6 @@ static struct iscsi_transport iscsi_tcp_transport = {
         .host_param_mask        = ISCSI_HOST_HWADDRESS | ISCSI_HOST_IPADDRESS |
                                   ISCSI_HOST_INITIATOR_NAME |
                                   ISCSI_HOST_NETDEV_NAME,
-        .conndata_size          = sizeof(struct iscsi_conn),
-        .sessiondata_size       = sizeof(struct iscsi_session),
         /* session management */
         .create_session         = iscsi_tcp_session_create,
         .destroy_session        = iscsi_tcp_session_destroy,
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 73c37c04ca66..784a935fad4a 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -1867,7 +1867,8 @@ iscsi_session_setup(struct iscsi_transport *iscsit, struct Scsi_Host *shost,
                 cmds_max = ISCSI_DEF_XMIT_CMDS_MAX;
         }
 
-        cls_session = iscsi_alloc_session(shost, iscsit);
+        cls_session = iscsi_alloc_session(shost, iscsit,
+                                          sizeof(struct iscsi_session));
         if (!cls_session)
                 return NULL;
         session = cls_session->dd_data;
@@ -1968,22 +1969,26 @@ EXPORT_SYMBOL_GPL(iscsi_session_teardown);
 /**
  * iscsi_conn_setup - create iscsi_cls_conn and iscsi_conn
  * @cls_session: iscsi_cls_session
+ * @dd_size: private driver data size
  * @conn_idx: cid
- **/
+ */
 struct iscsi_cls_conn *
-iscsi_conn_setup(struct iscsi_cls_session *cls_session, uint32_t conn_idx)
+iscsi_conn_setup(struct iscsi_cls_session *cls_session, int dd_size,
+                 uint32_t conn_idx)
 {
         struct iscsi_session *session = cls_session->dd_data;
         struct iscsi_conn *conn;
         struct iscsi_cls_conn *cls_conn;
         char *data;
 
-        cls_conn = iscsi_create_conn(cls_session, conn_idx);
+        cls_conn = iscsi_create_conn(cls_session, sizeof(*conn) + dd_size,
+                                     conn_idx);
         if (!cls_conn)
                 return NULL;
         conn = cls_conn->dd_data;
-        memset(conn, 0, sizeof(*conn));
+        memset(conn, 0, sizeof(*conn) + dd_size);
 
+        conn->dd_data = cls_conn->dd_data + sizeof(*conn);
         conn->session = session;
         conn->cls_conn = cls_conn;
         conn->c_stage = ISCSI_CONN_INITIAL_STAGE;
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 6c6ee0f34995..5822dd595826 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -113,8 +113,6 @@ static struct iscsi_transport qla4xxx_iscsi_transport = {
         .host_param_mask        = ISCSI_HOST_HWADDRESS |
                                   ISCSI_HOST_IPADDRESS |
                                   ISCSI_HOST_INITIATOR_NAME,
-        .sessiondata_size       = sizeof(struct ddb_entry),
-
         .tgt_dscvr              = qla4xxx_tgt_dscvr,
         .get_conn_param         = qla4xxx_conn_get_param,
         .get_session_param      = qla4xxx_sess_get_param,
@@ -274,7 +272,7 @@ int qla4xxx_add_sess(struct ddb_entry *ddb_entry)
                 return err;
         }
 
-        ddb_entry->conn = iscsi_create_conn(ddb_entry->sess, 0);
+        ddb_entry->conn = iscsi_create_conn(ddb_entry->sess, 0, 0);
         if (!ddb_entry->conn) {
                 iscsi_remove_session(ddb_entry->sess);
                 DEBUG2(printk(KERN_ERR "Could not add connection.\n"));
@@ -291,7 +289,8 @@ struct ddb_entry *qla4xxx_alloc_sess(struct scsi_qla_host *ha)
         struct ddb_entry *ddb_entry;
         struct iscsi_cls_session *sess;
 
-        sess = iscsi_alloc_session(ha->host, &qla4xxx_iscsi_transport);
+        sess = iscsi_alloc_session(ha->host, &qla4xxx_iscsi_transport,
+                                   sizeof(struct ddb_entry));
         if (!sess)
                 return NULL;
 
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 6fdaa2ee6632..6b8516a0970b 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -483,12 +483,12 @@ static int iscsi_unbind_session(struct iscsi_cls_session *session)
 }
 
 struct iscsi_cls_session *
-iscsi_alloc_session(struct Scsi_Host *shost,
-                    struct iscsi_transport *transport)
+iscsi_alloc_session(struct Scsi_Host *shost, struct iscsi_transport *transport,
+                    int dd_size)
 {
         struct iscsi_cls_session *session;
 
-        session = kzalloc(sizeof(*session) + transport->sessiondata_size,
+        session = kzalloc(sizeof(*session) + dd_size,
                           GFP_KERNEL);
         if (!session)
                 return NULL;
@@ -510,7 +510,7 @@ iscsi_alloc_session(struct Scsi_Host *shost,
         session->dev.parent = &shost->shost_gendev;
         session->dev.release = iscsi_session_release;
         device_initialize(&session->dev);
-        if (transport->sessiondata_size)
+        if (dd_size)
                 session->dd_data = &session[1];
         return session;
 }
@@ -558,18 +558,18 @@ EXPORT_SYMBOL_GPL(iscsi_add_session);
  * iscsi_create_session - create iscsi class session
  * @shost: scsi host
  * @transport: iscsi transport
+ * @dd_size: private driver data size
  * @target_id: which target
  *
  * This can be called from a LLD or iscsi_transport.
  */
 struct iscsi_cls_session *
-iscsi_create_session(struct Scsi_Host *shost,
-                     struct iscsi_transport *transport,
-                     unsigned int target_id)
+iscsi_create_session(struct Scsi_Host *shost, struct iscsi_transport *transport,
+                     int dd_size, unsigned int target_id)
 {
         struct iscsi_cls_session *session;
 
-        session = iscsi_alloc_session(shost, transport);
+        session = iscsi_alloc_session(shost, transport, dd_size);
         if (!session)
                 return NULL;
 
@@ -671,6 +671,7 @@ EXPORT_SYMBOL_GPL(iscsi_destroy_session);
 /**
  * iscsi_create_conn - create iscsi class connection
  * @session: iscsi cls session
+ * @dd_size: private driver data size
  * @cid: connection id
  *
  * This can be called from a LLD or iscsi_transport. The connection
@@ -683,18 +684,17 @@ EXPORT_SYMBOL_GPL(iscsi_destroy_session);
  * non-zero.
  */
 struct iscsi_cls_conn *
-iscsi_create_conn(struct iscsi_cls_session *session, uint32_t cid)
+iscsi_create_conn(struct iscsi_cls_session *session, int dd_size, uint32_t cid)
 {
         struct iscsi_transport *transport = session->transport;
         struct iscsi_cls_conn *conn;
         unsigned long flags;
         int err;
 
-        conn = kzalloc(sizeof(*conn) + transport->conndata_size, GFP_KERNEL);
+        conn = kzalloc(sizeof(*conn) + dd_size, GFP_KERNEL);
         if (!conn)
                 return NULL;
-
-        if (transport->conndata_size)
+        if (dd_size)
                 conn->dd_data = &conn[1];
 
         INIT_LIST_HEAD(&conn->conn_list);