Skip to content

Commit d382672

Browse files
Mike ChristieJames Bottomley
Mike Christie
authored and
James Bottomley
committed
[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 <[email protected]> Signed-off-by: James Bottomley <[email protected]>
1 parent 40753ca commit d382672

File tree

6 files changed

+1
-11
lines changed

6 files changed

+1
-11
lines changed

drivers/infiniband/ulp/iser/iscsi_iser.c

-1
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,6 @@ static struct iscsi_transport iscsi_iser_transport = {
592592
.host_template = &iscsi_iser_sht,
593593
.conndata_size = sizeof(struct iscsi_conn),
594594
.max_lun = ISCSI_ISER_MAX_LUN,
595-
.max_cmd_len = ISCSI_ISER_MAX_CMD_LEN,
596595
/* session management */
597596
.create_session = iscsi_iser_session_create,
598597
.destroy_session = iscsi_session_teardown,

drivers/infiniband/ulp/iser/iscsi_iser.h

-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@
9696
/* support upto 512KB in one RDMA */
9797
#define ISCSI_ISER_SG_TABLESIZE (0x80000 >> SHIFT_4K)
9898
#define ISCSI_ISER_MAX_LUN 256
99-
#define ISCSI_ISER_MAX_CMD_LEN 16
10099

101100
/* QP settings */
102101
/* Maximal bounds on received asynchronous PDUs */

drivers/scsi/iscsi_tcp.c

-2
Original file line numberDiff line numberDiff line change
@@ -1978,8 +1978,6 @@ static struct iscsi_transport iscsi_tcp_transport = {
19781978
ISCSI_HOST_NETDEV_NAME,
19791979
.host_template = &iscsi_sht,
19801980
.conndata_size = sizeof(struct iscsi_conn),
1981-
.max_conn = 1,
1982-
.max_cmd_len = 16,
19831981
/* session management */
19841982
.create_session = iscsi_tcp_session_create,
19851983
.destroy_session = iscsi_tcp_session_destroy,

drivers/scsi/libiscsi.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1830,7 +1830,7 @@ iscsi_session_setup(struct iscsi_transport *iscsit,
18301830
shost->max_id = 1;
18311831
shost->max_channel = 0;
18321832
shost->max_lun = iscsit->max_lun;
1833-
shost->max_cmd_len = iscsit->max_cmd_len;
1833+
shost->max_cmd_len = 16;
18341834
shost->transportt = scsit;
18351835
shost->transportt->create_work_queue = 1;
18361836
shost->transportt->eh_timed_out = iscsi_eh_cmd_timed_out;

drivers/scsi/scsi_transport_iscsi.c

-4
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,11 @@ static DEVICE_ATTR(name, S_IRUGO, show_transport_##name, NULL);
102102

103103
show_transport_attr(caps, "0x%x");
104104
show_transport_attr(max_lun, "%d");
105-
show_transport_attr(max_conn, "%d");
106-
show_transport_attr(max_cmd_len, "%d");
107105

108106
static struct attribute *iscsi_transport_attrs[] = {
109107
&dev_attr_handle.attr,
110108
&dev_attr_caps.attr,
111109
&dev_attr_max_lun.attr,
112-
&dev_attr_max_conn.attr,
113-
&dev_attr_max_cmd_len.attr,
114110
NULL,
115111
};
116112

include/scsi/scsi_transport_iscsi.h

-2
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ struct iscsi_transport {
8989
/* LLD session data size */
9090
int sessiondata_size;
9191
int max_lun;
92-
unsigned int max_conn;
93-
unsigned int max_cmd_len;
9492
struct iscsi_cls_session *(*create_session) (struct iscsi_transport *it,
9593
struct scsi_transport_template *t, struct Scsi_Host *shost,
9694
uint16_t cmds_max, uint16_t qdepth, uint32_t sn, uint32_t *hn);

0 commit comments

Comments
 (0)