[SCSI] iscsi: remove session/conn_data_size from iscsi_transport

This removes the session and conn data_size fields from the iscsi_transport.
Just pass in the value like with host allocation. This patch also makes
it so the LLD iscsi_conn data is allocated with the iscsi_cls_conn.

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

1 files changed, 3 insertions, 4 deletions

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;