Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83236f01 authored by Max Gurtovoy's avatar Max Gurtovoy Committed by Doug Ledford
Browse files

IB/iser: remove unused variable from iser_conn struct 



max_sectors calculation was fixed in commit:
9c674815 ("IB/iser: Fix max_sectors calculation").
Thus, iser_conn variable scsi_max_sectors is not needed anymore.

Signed-off-by: default avatarMax Gurtovoy <maxg@mellanox.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Tested-by: default avatarRaju Rangoju <rajur@chelsio.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 1e5db6c3

drivers/infiniband/ulp/iser/iscsi_iser.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -672,6 +672,10 @@ iscsi_iser_session_create(struct iscsi_endpoint *ep, 
	max_fr_sectors = ((shost->sg_tablesize - 1) * PAGE_SIZE) >> 9;

	max_fr_sectors = ((shost->sg_tablesize - 1) * PAGE_SIZE) >> 9;

	shost->max_sectors = min(iser_max_sectors, max_fr_sectors);

	shost->max_sectors = min(iser_max_sectors, max_fr_sectors);





	iser_dbg("iser_conn %p, sg_tablesize %u, max_sectors %u\n",

		 iser_conn, shost->sg_tablesize,

		 shost->max_sectors);



	if (cmds_max > max_cmds) {

	if (cmds_max > max_cmds) {

		iser_info("cmds_max changed from %u to %u\n",

		iser_info("cmds_max changed from %u to %u\n",

			  cmds_max, max_cmds);

			  cmds_max, max_cmds);

drivers/infiniband/ulp/iser/iscsi_iser.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -496,7 +496,6 @@ struct ib_conn { 
 * @rx_descs:         rx buffers array (cyclic buffer)

 * @rx_descs:         rx buffers array (cyclic buffer)

 * @num_rx_descs:     number of rx descriptors

 * @num_rx_descs:     number of rx descriptors

 * @scsi_sg_tablesize: scsi host sg_tablesize

 * @scsi_sg_tablesize: scsi host sg_tablesize

 * @scsi_max_sectors: scsi host max sectors

 */

 */

struct iser_conn {

struct iser_conn {

	struct ib_conn		     ib_conn;

	struct ib_conn		     ib_conn;
@@ -519,7 +518,6 @@ struct iser_conn { 
	struct iser_rx_desc	     *rx_descs;

	struct iser_rx_desc	     *rx_descs;

	u32                          num_rx_descs;

	u32                          num_rx_descs;

	unsigned short               scsi_sg_tablesize;

	unsigned short               scsi_sg_tablesize;

	unsigned int                 scsi_max_sectors;

	bool			     snd_w_inv;

	bool			     snd_w_inv;

};

};

drivers/infiniband/ulp/iser/iser_verbs.c

+1 −12
Original line number Original line Diff line number Diff line
@@ -707,18 +707,7 @@ iser_calc_scsi_params(struct iser_conn *iser_conn, 
	sup_sg_tablesize = min_t(unsigned, ISCSI_ISER_MAX_SG_TABLESIZE,

	sup_sg_tablesize = min_t(unsigned, ISCSI_ISER_MAX_SG_TABLESIZE,

				 device->ib_device->attrs.max_fast_reg_page_list_len);

				 device->ib_device->attrs.max_fast_reg_page_list_len);





	if (sg_tablesize > sup_sg_tablesize) {

	iser_conn->scsi_sg_tablesize = min(sg_tablesize, sup_sg_tablesize);

		sg_tablesize = sup_sg_tablesize;

		iser_conn->scsi_max_sectors = sg_tablesize * SIZE_4K / 512;

	} else {

		iser_conn->scsi_max_sectors = max_sectors;

	}



	iser_conn->scsi_sg_tablesize = sg_tablesize;



	iser_dbg("iser_conn %p, sg_tablesize %u, max_sectors %u\n",

		 iser_conn, iser_conn->scsi_sg_tablesize,

		 iser_conn->scsi_max_sectors);

}

}





/**

/**