mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-05-02 18:17:50 -04:00
[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>
This commit is contained in:
committed by
James Bottomley
parent
a4804cd6eb
commit
5d91e209fb
@@ -313,8 +313,6 @@ struct iscsi_host {
|
||||
char local_address[ISCSI_ADDRESS_BUF_LEN];
|
||||
};
|
||||
|
||||
#define iscsi_host_priv(_shost) \
|
||||
(shost_priv(_shost) + sizeof(struct iscsi_host))
|
||||
/*
|
||||
* scsi host template
|
||||
*/
|
||||
@@ -325,10 +323,12 @@ extern int iscsi_eh_device_reset(struct scsi_cmnd *sc);
|
||||
extern int iscsi_queuecommand(struct scsi_cmnd *sc,
|
||||
void (*done)(struct scsi_cmnd *));
|
||||
|
||||
|
||||
/*
|
||||
* iSCSI host helpers.
|
||||
*/
|
||||
#define iscsi_host_priv(_shost) \
|
||||
(shost_priv(_shost) + sizeof(struct iscsi_host))
|
||||
|
||||
extern int iscsi_host_set_param(struct Scsi_Host *shost,
|
||||
enum iscsi_host_param param, char *buf,
|
||||
int buflen);
|
||||
@@ -360,7 +360,7 @@ extern int iscsi_session_get_param(struct iscsi_cls_session *cls_session,
|
||||
* connection management
|
||||
*/
|
||||
extern struct iscsi_cls_conn *iscsi_conn_setup(struct iscsi_cls_session *,
|
||||
uint32_t);
|
||||
int, uint32_t);
|
||||
extern void iscsi_conn_teardown(struct iscsi_cls_conn *);
|
||||
extern int iscsi_conn_start(struct iscsi_cls_conn *);
|
||||
extern void iscsi_conn_stop(struct iscsi_cls_conn *, int);
|
||||
|
||||
@@ -83,10 +83,6 @@ struct iscsi_transport {
|
||||
/* LLD sets this to indicate what values it can export to sysfs */
|
||||
uint64_t param_mask;
|
||||
uint64_t host_param_mask;
|
||||
/* LLD connection data size */
|
||||
int conndata_size;
|
||||
/* LLD session data size */
|
||||
int sessiondata_size;
|
||||
struct iscsi_cls_session *(*create_session) (struct Scsi_Host *shost,
|
||||
uint16_t cmds_max, uint16_t qdepth,
|
||||
uint32_t sn, uint32_t *hn);
|
||||
@@ -222,19 +218,20 @@ extern void iscsi_host_for_each_session(struct Scsi_Host *shost,
|
||||
|
||||
extern int iscsi_session_chkready(struct iscsi_cls_session *session);
|
||||
extern struct iscsi_cls_session *iscsi_alloc_session(struct Scsi_Host *shost,
|
||||
struct iscsi_transport *transport);
|
||||
struct iscsi_transport *transport, int dd_size);
|
||||
extern int iscsi_add_session(struct iscsi_cls_session *session,
|
||||
unsigned int target_id);
|
||||
extern int iscsi_session_event(struct iscsi_cls_session *session,
|
||||
enum iscsi_uevent_e event);
|
||||
extern struct iscsi_cls_session *iscsi_create_session(struct Scsi_Host *shost,
|
||||
struct iscsi_transport *t,
|
||||
int dd_size,
|
||||
unsigned int target_id);
|
||||
extern void iscsi_remove_session(struct iscsi_cls_session *session);
|
||||
extern void iscsi_free_session(struct iscsi_cls_session *session);
|
||||
extern int iscsi_destroy_session(struct iscsi_cls_session *session);
|
||||
extern struct iscsi_cls_conn *iscsi_create_conn(struct iscsi_cls_session *sess,
|
||||
uint32_t cid);
|
||||
int dd_size, uint32_t cid);
|
||||
extern int iscsi_destroy_conn(struct iscsi_cls_conn *conn);
|
||||
extern void iscsi_unblock_session(struct iscsi_cls_session *session);
|
||||
extern void iscsi_block_session(struct iscsi_cls_session *session);
|
||||
|
||||
Reference in New Issue
Block a user