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

Commit b8b9e1b8 authored by Jayamohan Kallickal's avatar Jayamohan Kallickal Committed by James Bottomley
Browse files

[SCSI] libiscsi: iscsi_session_setup to allow for private space 



This patch contains changes that allow iscsi_session_setup
to allocate private space for LLD's

Signed-off-by: default avatarJayamohan Kallickal <jayamohank@serverengines.com>
Acked-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 6733b39a

drivers/infiniband/ulp/iser/iscsi_iser.c

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ iscsi_iser_session_create(struct iscsi_endpoint *ep, 
	 * because we preallocate so many resources

	 */

	cls_session = iscsi_session_setup(&iscsi_iser_transport, shost,

					  ISCSI_DEF_XMIT_CMDS_MAX,

					  ISCSI_DEF_XMIT_CMDS_MAX, 0,

					  sizeof(struct iscsi_iser_task),

					  initial_cmdsn, 0);

	if (!cls_session)

drivers/scsi/be2iscsi/be_iscsi.c

+4 −2
Original line number Diff line number Diff line
@@ -44,9 +44,10 @@ struct iscsi_cls_session *beiscsi_session_create(struct iscsi_endpoint *ep, 
	struct Scsi_Host *shost;

	struct beiscsi_endpoint *beiscsi_ep;

	struct iscsi_cls_session *cls_session;

	struct iscsi_session *sess;

	struct beiscsi_hba *phba;

	struct iscsi_task *task;

	struct iscsi_session *sess;

	struct beiscsi_session *beiscsi_sess;

	struct beiscsi_io_task *io_task;

	unsigned int max_size, num_cmd;

	dma_addr_t bus_add;
@@ -73,7 +74,8 @@ struct iscsi_cls_session *beiscsi_session_create(struct iscsi_endpoint *ep, 


	 cls_session = iscsi_session_setup(&beiscsi_iscsi_transport,

					   shost, cmds_max,

					   sizeof(struct beiscsi_io_task),

					   sizeof(*beiscsi_sess),

					   sizeof(*io_task),

					   initial_cmdsn, ISCSI_MAX_TARGET);

	if (!cls_session)

		return NULL;

drivers/scsi/be2iscsi/be_main.h

+5 −0
Original line number Diff line number Diff line
@@ -327,6 +327,10 @@ struct beiscsi_hba { 
	struct be_ctrl_info ctrl;

};



struct beiscsi_session {

	struct pci_pool *bhs_pool;

};



/**

 * struct beiscsi_conn - iscsi connection structure

 */
@@ -338,6 +342,7 @@ struct beiscsi_conn { 
	struct beiscsi_endpoint *ep;

	unsigned short login_in_progress;

	struct sgl_handle *plogin_sgl_handle;

	struct beiscsi_session *beiscsi_sess;

};



/* This structure is used by the chip */

drivers/scsi/bnx2i/bnx2i_iscsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1243,7 +1243,7 @@ bnx2i_session_create(struct iscsi_endpoint *ep, 
		cmds_max = BNX2I_SQ_WQES_MIN;



	cls_session = iscsi_session_setup(&bnx2i_iscsi_transport, shost,

					  cmds_max, sizeof(struct bnx2i_cmd),

					  cmds_max, 0, sizeof(struct bnx2i_cmd),

					  initial_cmdsn, ISCSI_MAX_TARGET);

	if (!cls_session)

		return NULL;

drivers/scsi/cxgb3i/cxgb3i_iscsi.c

+1 −1
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ cxgb3i_session_create(struct iscsi_endpoint *ep, u16 cmds_max, u16 qdepth, 
	BUG_ON(hba != iscsi_host_priv(shost));



	cls_session = iscsi_session_setup(&cxgb3i_iscsi_transport, shost,

					  cmds_max,

					  cmds_max, 0,

					  sizeof(struct iscsi_tcp_task) +

					  sizeof(struct cxgb3i_task_data),

					  initial_cmdsn, ISCSI_MAX_TARGET);