[SCSI] iscsi class, iscsi drivers: remove unused iscsi_transport attrs

max_cmd_len and max_conn are not really used. max_cmd_len is
always 16 and can be set by the LLD. max_conn is always one
since we do not support MCS.

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

diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c
index efc121986c50f86af2c054aa2e7f3c53988bebc5..32f5d5e79abff24dee87f04b581a55f83cae5a48 100644 (file)
--- a/drivers/infiniband/ulp/iser/iscsi_iser.c
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.c
@@ -592,7 +592,6 @@ static struct iscsi_transport iscsi_iser_transport = {
        .host_template          = &iscsi_iser_sht,
        .conndata_size          = sizeof(struct iscsi_conn),
        .max_lun                = ISCSI_ISER_MAX_LUN,
-       .max_cmd_len            = ISCSI_ISER_MAX_CMD_LEN,
        /* session management */
        .create_session         = iscsi_iser_session_create,
        .destroy_session        = iscsi_session_teardown,

diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.h b/drivers/infiniband/ulp/iser/iscsi_iser.h
index a8c1b300e34d54d76eb18eeb646db24b2c34b598..66a2f30ada01f425554b2c4d3576483f00ff3416 100644 (file)
--- a/drivers/infiniband/ulp/iser/iscsi_iser.h
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.h
@@ -96,7 +96,6 @@
                                        /* support upto 512KB in one RDMA */
 #define ISCSI_ISER_SG_TABLESIZE         (0x80000 >> SHIFT_4K)
 #define ISCSI_ISER_MAX_LUN             256
-#define ISCSI_ISER_MAX_CMD_LEN         16
 
 /* QP settings */
 /* Maximal bounds on received asynchronous PDUs */

diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index 81c421a7d47717f0341f1a638a02c285d7203a07..aecadbdce9df979342b8a60b462a7eab34c03a6c 100644 (file)
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -1978,8 +1978,6 @@ static struct iscsi_transport iscsi_tcp_transport = {
                                  ISCSI_HOST_NETDEV_NAME,
        .host_template          = &iscsi_sht,
        .conndata_size          = sizeof(struct iscsi_conn),
-       .max_conn               = 1,
-       .max_cmd_len            = 16,
        /* 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 b43bf1d60dac8a5499922f8a66da15b3c26626d2..01a1a4d36f215917667c09947f6f4a3fbc756ebe 100644 (file)
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -1830,7 +1830,7 @@ iscsi_session_setup(struct iscsi_transport *iscsit,
        shost->max_id = 1;
        shost->max_channel = 0;
        shost->max_lun = iscsit->max_lun;
-       shost->max_cmd_len = iscsit->max_cmd_len;
+       shost->max_cmd_len = 16;
        shost->transportt = scsit;
        shost->transportt->create_work_queue = 1;
        shost->transportt->eh_timed_out = iscsi_eh_cmd_timed_out;

diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 2a6669d967cbbbfee99b06e14e4a9ffdda089d34..e6a090e9c8a4a5a5c6749be04ec1d1e0a5cf0287 100644 (file)
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -102,15 +102,11 @@ static DEVICE_ATTR(name, S_IRUGO, show_transport_##name, NULL);
 
 show_transport_attr(caps, "0x%x");
 show_transport_attr(max_lun, "%d");
-show_transport_attr(max_conn, "%d");
-show_transport_attr(max_cmd_len, "%d");
 
 static struct attribute *iscsi_transport_attrs[] = {
        &dev_attr_handle.attr,
        &dev_attr_caps.attr,
        &dev_attr_max_lun.attr,
-       &dev_attr_max_conn.attr,
-       &dev_attr_max_cmd_len.attr,
        NULL,
 };
 

diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h
index 02a852000be7196292ea8c859b74ee1f4b3e3c0d..afed70ec2aa5d33ac44c52c9a5ec8e70a6390b5c 100644 (file)
--- a/include/scsi/scsi_transport_iscsi.h
+++ b/include/scsi/scsi_transport_iscsi.h
@@ -89,8 +89,6 @@ struct iscsi_transport {
        /* LLD session data size */
        int sessiondata_size;
        int max_lun;
-       unsigned int max_conn;
-       unsigned int max_cmd_len;
        struct iscsi_cls_session *(*create_session) (struct iscsi_transport *it,
                struct scsi_transport_template *t, struct Scsi_Host *shost,
                uint16_t cmds_max, uint16_t qdepth, uint32_t sn, uint32_t *hn);