On Tuesday, October 31, 2017 at 3:41:45 PM UTC-7, Chris Leech wrote: > > cleanups after the bus to class conversion >
If this has no functional change I'd prefer it if you made that more clear. Or maybe it's just me? Not that I have anything against cleanups, in general. > > Signed-off-by: Chris Leech <[email protected]> > --- > drivers/scsi/qla4xxx/ql4_os.c | 52 +++++++++--------- > drivers/scsi/scsi_transport_iscsi.c | 102 > ++++++++++++++++++------------------ > include/scsi/scsi_transport_iscsi.h | 48 +++++++++-------- > 3 files changed, 102 insertions(+), 100 deletions(-) > > diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c > index 55a729568873..9c80688d0681 100644 > --- a/drivers/scsi/qla4xxx/ql4_os.c > +++ b/drivers/scsi/qla4xxx/ql4_os.c > @@ -169,20 +169,20 @@ static int qla4xxx_host_reset(struct Scsi_Host > *shost, int reset_type); > * iSCSI Flash DDB sysfs entry points > */ > static int > -qla4xxx_sysfs_ddb_set_param(struct iscsi_bus_flash_session *fnode_sess, > - struct iscsi_bus_flash_conn *fnode_conn, > +qla4xxx_sysfs_ddb_set_param(struct iscsi_flash_session *fnode_sess, > + struct iscsi_flash_conn *fnode_conn, > void *data, int len); > static int > -qla4xxx_sysfs_ddb_get_param(struct iscsi_bus_flash_session *fnode_sess, > +qla4xxx_sysfs_ddb_get_param(struct iscsi_flash_session *fnode_sess, > int param, char *buf); > static int qla4xxx_sysfs_ddb_add(struct Scsi_Host *shost, const char > *buf, > int len); > static int > -qla4xxx_sysfs_ddb_delete(struct iscsi_bus_flash_session *fnode_sess); > -static int qla4xxx_sysfs_ddb_login(struct iscsi_bus_flash_session > *fnode_sess, > - struct iscsi_bus_flash_conn > *fnode_conn); > -static int qla4xxx_sysfs_ddb_logout(struct iscsi_bus_flash_session > *fnode_sess, > - struct iscsi_bus_flash_conn > *fnode_conn); > +qla4xxx_sysfs_ddb_delete(struct iscsi_flash_session *fnode_sess); > +static int qla4xxx_sysfs_ddb_login(struct iscsi_flash_session > *fnode_sess, > + struct iscsi_flash_conn *fnode_conn); > +static int qla4xxx_sysfs_ddb_logout(struct iscsi_flash_session > *fnode_sess, > + struct iscsi_flash_conn *fnode_conn); > static int qla4xxx_sysfs_ddb_logout_sid(struct iscsi_cls_session > *cls_sess); > > static struct qla4_8xxx_legacy_intr_set legacy_intr[] = > @@ -3454,8 +3454,8 @@ static int qla4xxx_task_xmit(struct iscsi_task > *task) > return -ENOSYS; > } > > -static int qla4xxx_copy_from_fwddb_param(struct iscsi_bus_flash_session > *sess, > - struct iscsi_bus_flash_conn > *conn, > +static int qla4xxx_copy_from_fwddb_param(struct iscsi_flash_session > *sess, > + struct iscsi_flash_conn *conn, > struct dev_db_entry > *fw_ddb_entry) > { > unsigned long options = 0; > @@ -3596,8 +3596,8 @@ static int qla4xxx_copy_from_fwddb_param(struct > iscsi_bus_flash_session *sess, > return rc; > } > > -static int qla4xxx_copy_to_fwddb_param(struct iscsi_bus_flash_session > *sess, > - struct iscsi_bus_flash_conn *conn, > +static int qla4xxx_copy_to_fwddb_param(struct iscsi_flash_session *sess, > + struct iscsi_flash_conn *conn, > struct dev_db_entry *fw_ddb_entry) > { > uint16_t options; > @@ -7162,7 +7162,7 @@ static void qla4xxx_build_new_nt_list(struct > scsi_qla_host *ha, > **/ > static int qla4xxx_sysfs_ddb_is_non_persistent(struct device *dev, void > *data) > { > - struct iscsi_bus_flash_session *fnode_sess; > + struct iscsi_flash_session *fnode_sess; > > if (!iscsi_is_flashnode_session_dev(dev)) > return 0; > @@ -7192,8 +7192,8 @@ static int qla4xxx_sysfs_ddb_tgt_create(struct > scsi_qla_host *ha, > struct dev_db_entry > *fw_ddb_entry, > uint16_t *idx, int user) > { > - struct iscsi_bus_flash_session *fnode_sess = NULL; > - struct iscsi_bus_flash_conn *fnode_conn = NULL; > + struct iscsi_flash_session *fnode_sess = NULL; > + struct iscsi_flash_conn *fnode_conn = NULL; > int rc = QLA_ERROR; > > fnode_sess = iscsi_create_flashnode_sess(ha->host, *idx, > @@ -7330,8 +7330,8 @@ static int qla4xxx_sysfs_ddb_add(struct Scsi_Host > *shost, const char *buf, > * This writes the contents of target ddb buffer to Flash with a valid > cookie > * value in order to make the ddb entry persistent. > **/ > -static int qla4xxx_sysfs_ddb_apply(struct iscsi_bus_flash_session > *fnode_sess, > - struct iscsi_bus_flash_conn > *fnode_conn) > +static int qla4xxx_sysfs_ddb_apply(struct iscsi_flash_session > *fnode_sess, > + struct iscsi_flash_conn *fnode_conn) > { > struct Scsi_Host *shost = > iscsi_flash_session_to_shost(fnode_sess); > struct scsi_qla_host *ha = to_qla_host(shost); > @@ -7520,8 +7520,8 @@ static int qla4xxx_ddb_login_nt(struct scsi_qla_host > *ha, > * > * This logs in to the specified target > **/ > -static int qla4xxx_sysfs_ddb_login(struct iscsi_bus_flash_session > *fnode_sess, > - struct iscsi_bus_flash_conn > *fnode_conn) > +static int qla4xxx_sysfs_ddb_login(struct iscsi_flash_session > *fnode_sess, > + struct iscsi_flash_conn *fnode_conn) > { > struct Scsi_Host *shost = > iscsi_flash_session_to_shost(fnode_sess); > struct scsi_qla_host *ha = to_qla_host(shost); > @@ -7704,8 +7704,8 @@ static int qla4xxx_sysfs_ddb_logout_sid(struct > iscsi_cls_session *cls_sess) > * > * This performs log out from the specified target > **/ > -static int qla4xxx_sysfs_ddb_logout(struct iscsi_bus_flash_session > *fnode_sess, > - struct iscsi_bus_flash_conn > *fnode_conn) > +static int qla4xxx_sysfs_ddb_logout(struct iscsi_flash_session > *fnode_sess, > + struct iscsi_flash_conn *fnode_conn) > { > struct Scsi_Host *shost = > iscsi_flash_session_to_shost(fnode_sess); > struct scsi_qla_host *ha = to_qla_host(shost); > @@ -7816,12 +7816,12 @@ static int qla4xxx_sysfs_ddb_logout(struct > iscsi_bus_flash_session *fnode_sess, > } > > static int > -qla4xxx_sysfs_ddb_get_param(struct iscsi_bus_flash_session *fnode_sess, > +qla4xxx_sysfs_ddb_get_param(struct iscsi_flash_session *fnode_sess, > int param, char *buf) > { > struct Scsi_Host *shost = > iscsi_flash_session_to_shost(fnode_sess); > struct scsi_qla_host *ha = to_qla_host(shost); > - struct iscsi_bus_flash_conn *fnode_conn; > + struct iscsi_flash_conn *fnode_conn; > struct ql4_chap_table chap_tbl; > struct device *dev; > int parent_type; > @@ -8070,8 +8070,8 @@ qla4xxx_sysfs_ddb_get_param(struct > iscsi_bus_flash_session *fnode_sess, > * This sets the parameter of flash ddb entry and writes them to flash > **/ > static int > -qla4xxx_sysfs_ddb_set_param(struct iscsi_bus_flash_session *fnode_sess, > - struct iscsi_bus_flash_conn *fnode_conn, > +qla4xxx_sysfs_ddb_set_param(struct iscsi_flash_session *fnode_sess, > + struct iscsi_flash_conn *fnode_conn, > void *data, int len) > { > struct Scsi_Host *shost = > iscsi_flash_session_to_shost(fnode_sess); > @@ -8298,7 +8298,7 @@ qla4xxx_sysfs_ddb_set_param(struct > iscsi_bus_flash_session *fnode_sess, > * > * This invalidates the flash ddb entry at the given index > **/ > -static int qla4xxx_sysfs_ddb_delete(struct iscsi_bus_flash_session > *fnode_sess) > +static int qla4xxx_sysfs_ddb_delete(struct iscsi_flash_session > *fnode_sess) > { > struct Scsi_Host *shost = > iscsi_flash_session_to_shost(fnode_sess); > struct scsi_qla_host *ha = to_qla_host(shost); > diff --git a/drivers/scsi/scsi_transport_iscsi.c > b/drivers/scsi/scsi_transport_iscsi.c > index b053d57a482d..5ffda170ac9d 100644 > --- a/drivers/scsi/scsi_transport_iscsi.c > +++ b/drivers/scsi/scsi_transport_iscsi.c > @@ -854,7 +854,7 @@ static > ssize_t \ > show_##type##_##name(struct device *dev, struct device_attribute > *attr, \ > char > *buf) \ > { \ > > - struct iscsi_bus_flash_session *fnode_sess > = \ > + struct iscsi_flash_session *fnode_sess = \ > iscsi_dev_to_flash_session(dev);\ > struct iscsi_transport *t = > fnode_sess->transport; \ > return t->get_flashnode_param(fnode_sess, param, > buf); \ > @@ -954,7 +954,7 @@ static umode_t > iscsi_flashnode_sess_attr_is_visible(struct kobject *kobj, > int i) > { > struct device *dev = container_of(kobj, struct device, kobj); > - struct iscsi_bus_flash_session *fnode_sess = > + struct iscsi_flash_session *fnode_sess = > > iscsi_dev_to_flash_session(dev); > > struct iscsi_transport *t = fnode_sess->transport; > int param; > @@ -1045,7 +1045,7 @@ static const struct attribute_group > *iscsi_flashnode_sess_attr_groups[] = { > > static void iscsi_flashnode_sess_release(struct device *dev) > { > - struct iscsi_bus_flash_session *fnode_sess = > + struct iscsi_flash_session *fnode_sess = > > iscsi_dev_to_flash_session(dev); > > > kfree(fnode_sess->targetname); > @@ -1055,7 +1055,7 @@ static void iscsi_flashnode_sess_release(struct > device *dev) > } > > static const struct device_type iscsi_flashnode_sess_dev_type = { > - .name = "iscsi_flashnode_sess_dev_type", > + .name = "iscsi_flashnode_sess", > .groups = iscsi_flashnode_sess_attr_groups, > .release = iscsi_flashnode_sess_release, > }; > @@ -1072,8 +1072,8 @@ static > ssize_t \ > show_##type##_##name(struct device *dev, struct device_attribute > *attr, \ > char > *buf) \ > { \ > > - struct iscsi_bus_flash_conn *fnode_conn = > iscsi_dev_to_flash_conn(dev);\ > - struct iscsi_bus_flash_session *fnode_sess > = \ > + struct iscsi_flash_conn *fnode_conn = > iscsi_dev_to_flash_conn(dev);\ > + struct iscsi_flash_session *fnode_sess = \ > > iscsi_flash_conn_to_flash_session(fnode_conn);\ > > struct iscsi_transport *t = > fnode_conn->transport; \ > return t->get_flashnode_param(fnode_sess, param, > buf); \ > @@ -1162,7 +1162,7 @@ static umode_t > iscsi_flashnode_conn_attr_is_visible(struct kobject *kobj, > int i) > { > struct device *dev = container_of(kobj, struct device, kobj); > - struct iscsi_bus_flash_conn *fnode_conn = > iscsi_dev_to_flash_conn(dev); > + struct iscsi_flash_conn *fnode_conn = > iscsi_dev_to_flash_conn(dev); > struct iscsi_transport *t = fnode_conn->transport; > int param; > > @@ -1238,7 +1238,7 @@ static const struct attribute_group > *iscsi_flashnode_conn_attr_groups[] = { > > static void iscsi_flashnode_conn_release(struct device *dev) > { > - struct iscsi_bus_flash_conn *fnode_conn = > iscsi_dev_to_flash_conn(dev); > + struct iscsi_flash_conn *fnode_conn = > iscsi_dev_to_flash_conn(dev); > > kfree(fnode_conn->ipaddress); > kfree(fnode_conn->redirect_ipaddr); > @@ -1247,12 +1247,28 @@ static void iscsi_flashnode_conn_release(struct > device *dev) > } > > static const struct device_type iscsi_flashnode_conn_dev_type = { > - .name = "iscsi_flashnode_conn_dev_type", > + .name = "iscsi_flashnode_conn", > .groups = iscsi_flashnode_conn_attr_groups, > .release = iscsi_flashnode_conn_release, > }; > > -static struct class iscsi_flashnode_bus = { > +/** > + * iscsi_is_flashnode_conn_dev - verify passed device is to be flashnode > conn > + * @dev: device to verify > + * @data: pointer to data containing value to use for verification > + * > + * Verifies if the passed device is flashnode conn device > + * > + * Returns: > + * 1 on success > + * 0 on failure > + */ > +static int iscsi_is_flashnode_conn_dev(struct device *dev, void *data) > +{ > + return dev->type == &iscsi_flashnode_conn_dev_type; > +} > + > +static struct class iscsi_flashnode = { > .name = "iscsi_flashnode", > }; > > @@ -1269,12 +1285,12 @@ static struct class iscsi_flashnode_bus = { > * pointer to allocated flashnode sess on success > * %NULL on failure > */ > -struct iscsi_bus_flash_session * > +struct iscsi_flash_session * > iscsi_create_flashnode_sess(struct Scsi_Host *shost, int index, > struct iscsi_transport *transport, > int dd_size) > { > - struct iscsi_bus_flash_session *fnode_sess; > + struct iscsi_flash_session *fnode_sess; > int err; > > fnode_sess = kzalloc(sizeof(*fnode_sess) + dd_size, GFP_KERNEL); > @@ -1284,7 +1300,7 @@ iscsi_create_flashnode_sess(struct Scsi_Host *shost, > int index, > fnode_sess->transport = transport; > fnode_sess->target_id = index; > fnode_sess->dev.type = &iscsi_flashnode_sess_dev_type; > - fnode_sess->dev.class = &iscsi_flashnode_bus; > + fnode_sess->dev.class = &iscsi_flashnode; > fnode_sess->dev.parent = &shost->shost_gendev; > dev_set_name(&fnode_sess->dev, "flashnode_sess-%u:%u", > shost->host_no, index); > @@ -1317,13 +1333,13 @@ EXPORT_SYMBOL_GPL(iscsi_create_flashnode_sess); > * pointer to allocated flashnode conn on success > * %NULL on failure > */ > -struct iscsi_bus_flash_conn * > +struct iscsi_flash_conn * > iscsi_create_flashnode_conn(struct Scsi_Host *shost, > - struct iscsi_bus_flash_session *fnode_sess, > + struct iscsi_flash_session *fnode_sess, > struct iscsi_transport *transport, > int dd_size) > { > - struct iscsi_bus_flash_conn *fnode_conn; > + struct iscsi_flash_conn *fnode_conn; > int err; > > fnode_conn = kzalloc(sizeof(*fnode_conn) + dd_size, GFP_KERNEL); > @@ -1332,7 +1348,7 @@ iscsi_create_flashnode_conn(struct Scsi_Host *shost, > > fnode_conn->transport = transport; > fnode_conn->dev.type = &iscsi_flashnode_conn_dev_type; > - fnode_conn->dev.class = &iscsi_flashnode_bus; > + fnode_conn->dev.class = &iscsi_flashnode; > fnode_conn->dev.parent = &fnode_sess->dev; > dev_set_name(&fnode_conn->dev, "flashnode_conn-%u:%u:0", > shost->host_no, fnode_sess->target_id); > @@ -1352,23 +1368,7 @@ iscsi_create_flashnode_conn(struct Scsi_Host > *shost, > } > EXPORT_SYMBOL_GPL(iscsi_create_flashnode_conn); > > -/** > - * iscsi_is_flashnode_conn_dev - verify passed device is to be flashnode > conn > - * @dev: device to verify > - * @data: pointer to data containing value to use for verification > - * > - * Verifies if the passed device is flashnode conn device > - * > - * Returns: > - * 1 on success > - * 0 on failure > - */ > -static int iscsi_is_flashnode_conn_dev(struct device *dev, void *data) > -{ > - return dev->type == &iscsi_flashnode_conn_dev_type; > -} > - > -static int iscsi_destroy_flashnode_conn(struct iscsi_bus_flash_conn > *fnode_conn) > +static int iscsi_destroy_flashnode_conn(struct iscsi_flash_conn > *fnode_conn) > { > device_unregister(&fnode_conn->dev); > return 0; > @@ -1376,10 +1376,10 @@ static int iscsi_destroy_flashnode_conn(struct > iscsi_bus_flash_conn *fnode_conn) > > static int flashnode_match_index(struct device *dev, void *data) > { > - struct iscsi_bus_flash_session *fnode_sess = NULL; > + struct iscsi_flash_session *fnode_sess = NULL; > int ret = 0; > > - if (dev->type != &iscsi_flashnode_sess_dev_type) > + if (!iscsi_is_flashnode_session_dev(dev)) > goto exit_match_index; > > fnode_sess = iscsi_dev_to_flash_session(dev); > @@ -1400,10 +1400,10 @@ static int flashnode_match_index(struct device > *dev, void *data) > * pointer to found flashnode session object on success > * %NULL on failure > */ > -static struct iscsi_bus_flash_session * > +static struct iscsi_flash_session * > iscsi_get_flashnode_by_index(struct Scsi_Host *shost, uint32_t idx) > { > - struct iscsi_bus_flash_session *fnode_sess = NULL; > + struct iscsi_flash_session *fnode_sess = NULL; > struct device *dev; > > dev = device_find_child(&shost->shost_gendev, &idx, > @@ -1447,7 +1447,7 @@ EXPORT_SYMBOL_GPL(iscsi_find_flashnode_sess); > * %NULL on failure > */ > struct device * > -iscsi_find_flashnode_conn(struct iscsi_bus_flash_session *fnode_sess) > +iscsi_find_flashnode_conn(struct iscsi_flash_session *fnode_sess) > { > return device_find_child(&fnode_sess->dev, NULL, > iscsi_is_flashnode_conn_dev); > @@ -1469,7 +1469,7 @@ static int > iscsi_iter_destroy_flashnode_conn_fn(struct device *dev, void *data) > * Deletes the flashnode session entry and all children flashnode > connection > * entries from sysfs > */ > -void iscsi_destroy_flashnode_sess(struct iscsi_bus_flash_session > *fnode_sess) > +void iscsi_destroy_flashnode_sess(struct iscsi_flash_session *fnode_sess) > { > int err; > > @@ -1485,7 +1485,7 @@ EXPORT_SYMBOL_GPL(iscsi_destroy_flashnode_sess); > > static int iscsi_iter_destroy_flashnode_fn(struct device *dev, void > *data) > { > - if (dev->type != &iscsi_flashnode_sess_dev_type) > + if (!iscsi_is_flashnode_session_dev(dev)) > return 0; > > iscsi_destroy_flashnode_sess(iscsi_dev_to_flash_session(dev)); > @@ -3302,8 +3302,8 @@ static int iscsi_set_flashnode_param(struct net > *net, > { > char *data = (char *)ev + sizeof(*ev); > struct Scsi_Host *shost; > - struct iscsi_bus_flash_session *fnode_sess; > - struct iscsi_bus_flash_conn *fnode_conn; > + struct iscsi_flash_session *fnode_sess; > + struct iscsi_flash_conn *fnode_conn; > struct device *dev; > uint32_t idx; > int err = 0; > @@ -3391,7 +3391,7 @@ static int iscsi_del_flashnode(struct net *net, > struct iscsi_uevent *ev) > { > struct Scsi_Host *shost; > - struct iscsi_bus_flash_session *fnode_sess; > + struct iscsi_flash_session *fnode_sess; > uint32_t idx; > int err = 0; > > @@ -3432,8 +3432,8 @@ static int iscsi_login_flashnode(struct net *net, > struct iscsi_uevent *ev) > { > struct Scsi_Host *shost; > - struct iscsi_bus_flash_session *fnode_sess; > - struct iscsi_bus_flash_conn *fnode_conn; > + struct iscsi_flash_session *fnode_sess; > + struct iscsi_flash_conn *fnode_conn; > struct device *dev; > uint32_t idx; > int err = 0; > @@ -3485,8 +3485,8 @@ static int iscsi_logout_flashnode(struct net *net, > struct iscsi_uevent *ev) > { > struct Scsi_Host *shost; > - struct iscsi_bus_flash_session *fnode_sess; > - struct iscsi_bus_flash_conn *fnode_conn; > + struct iscsi_flash_session *fnode_sess; > + struct iscsi_flash_conn *fnode_conn; > struct device *dev; > uint32_t idx; > int err = 0; > @@ -4746,7 +4746,7 @@ static __init int iscsi_transport_init(void) > if (err) > goto unregister_conn_class; > > - err = class_register(&iscsi_flashnode_bus); > + err = class_register(&iscsi_flashnode); > if (err) > goto unregister_session_class; > > @@ -4767,7 +4767,7 @@ static __init int iscsi_transport_init(void) > unregister_pernet_subsys: > unregister_pernet_subsys(&iscsi_net_ops); > unregister_flashnode_bus: > - class_unregister(&iscsi_flashnode_bus); > + class_unregister(&iscsi_flashnode); > unregister_session_class: > transport_class_unregister(&iscsi_session_class); > unregister_conn_class: > @@ -4787,7 +4787,7 @@ static void __exit iscsi_transport_exit(void) > { > destroy_workqueue(iscsi_eh_timer_workq); > unregister_pernet_subsys(&iscsi_net_ops); > - class_unregister(&iscsi_flashnode_bus); > + class_unregister(&iscsi_flashnode); > transport_class_unregister(&iscsi_connection_class); > transport_class_unregister(&iscsi_session_class); > transport_class_unregister(&iscsi_host_class); > diff --git a/include/scsi/scsi_transport_iscsi.h > b/include/scsi/scsi_transport_iscsi.h > index 2f461896e91f..df56a8454386 100644 > --- a/include/scsi/scsi_transport_iscsi.h > +++ b/include/scsi/scsi_transport_iscsi.h > @@ -39,8 +39,8 @@ struct iscsi_task; > struct sockaddr; > struct iscsi_iface; > struct bsg_job; > -struct iscsi_bus_flash_session; > -struct iscsi_bus_flash_conn; > +struct iscsi_flash_session; > +struct iscsi_flash_conn; > > /** > * struct iscsi_transport - iSCSI Transport template > @@ -153,18 +153,18 @@ struct iscsi_transport { > uint32_t *num_entries, char *buf); > int (*delete_chap) (struct Scsi_Host *shost, uint16_t > chap_tbl_idx); > int (*set_chap) (struct Scsi_Host *shost, void *data, int len); > - int (*get_flashnode_param) (struct iscsi_bus_flash_session > *fnode_sess, > - int param, char *buf); > - int (*set_flashnode_param) (struct iscsi_bus_flash_session > *fnode_sess, > - struct iscsi_bus_flash_conn > *fnode_conn, > - void *data, int len); > - int (*new_flashnode) (struct Scsi_Host *shost, const char *buf, > - int len); > - int (*del_flashnode) (struct iscsi_bus_flash_session > *fnode_sess); > - int (*login_flashnode) (struct iscsi_bus_flash_session > *fnode_sess, > - struct iscsi_bus_flash_conn *fnode_conn); > - int (*logout_flashnode) (struct iscsi_bus_flash_session > *fnode_sess, > - struct iscsi_bus_flash_conn > *fnode_conn); > + int (*get_flashnode_param)(struct iscsi_flash_session > *fnode_sess, > + int param, char *buf); > + int (*set_flashnode_param)(struct iscsi_flash_session > *fnode_sess, > + struct iscsi_flash_conn *fnode_conn, > + void *data, int len); > + int (*new_flashnode)(struct Scsi_Host *shost, const char *buf, > + int len); > + int (*del_flashnode)(struct iscsi_flash_session *fnode_sess); > + int (*login_flashnode)(struct iscsi_flash_session *fnode_sess, > + struct iscsi_flash_conn *fnode_conn); > + int (*logout_flashnode)(struct iscsi_flash_session *fnode_sess, > + struct iscsi_flash_conn *fnode_conn); > int (*logout_flashnode_sid) (struct iscsi_cls_session *cls_sess); > int (*get_host_stats) (struct Scsi_Host *shost, char *buf, int > len); > u8 (*check_protection)(struct iscsi_task *task, sector_t > *sector); > @@ -313,7 +313,7 @@ struct iscsi_iface { > dev_to_shost(_iface->dev.parent) > > > -struct iscsi_bus_flash_conn { > +struct iscsi_flash_conn { > struct list_head conn_list; /* item in connlist */ > void *dd_data; /* LLD private data */ > struct iscsi_transport *transport; > @@ -351,14 +351,14 @@ struct iscsi_bus_flash_conn { > }; > > #define iscsi_dev_to_flash_conn(_dev) \ > - container_of(_dev, struct iscsi_bus_flash_conn, dev) > + container_of(_dev, struct iscsi_flash_conn, dev) > > #define iscsi_flash_conn_to_flash_session(_conn) \ > iscsi_dev_to_flash_session(_conn->dev.parent) > > #define ISID_SIZE 6 > > -struct iscsi_bus_flash_session { > +struct iscsi_flash_session { > struct list_head sess_list; /* item in > session_list */ > struct iscsi_transport *transport; > unsigned int target_id; > @@ -413,7 +413,7 @@ struct iscsi_bus_flash_session { > }; > > #define iscsi_dev_to_flash_session(_dev) \ > - container_of(_dev, struct iscsi_bus_flash_session, dev) > + container_of(_dev, struct iscsi_flash_session, dev) > > #define iscsi_flash_session_to_shost(_session) \ > dev_to_shost(_session->dev.parent) > @@ -468,17 +468,17 @@ extern struct device * > iscsi_find_flashnode(struct Scsi_Host *shost, void *data, > int (*fn)(struct device *dev, void *data)); > > -extern struct iscsi_bus_flash_session * > +extern struct iscsi_flash_session * > iscsi_create_flashnode_sess(struct Scsi_Host *shost, int index, > struct iscsi_transport *transport, int > dd_size); > > -extern struct iscsi_bus_flash_conn * > +extern struct iscsi_flash_conn * > iscsi_create_flashnode_conn(struct Scsi_Host *shost, > - struct iscsi_bus_flash_session *fnode_sess, > + struct iscsi_flash_session *fnode_sess, > struct iscsi_transport *transport, int > dd_size); > > extern void > -iscsi_destroy_flashnode_sess(struct iscsi_bus_flash_session *fnode_sess); > +iscsi_destroy_flashnode_sess(struct iscsi_flash_session *fnode_sess); > > extern void iscsi_destroy_all_flashnode(struct Scsi_Host *shost); > extern int iscsi_flashnode_bus_match(struct device *dev, > @@ -487,7 +487,9 @@ extern struct device * > iscsi_find_flashnode_sess(struct Scsi_Host *shost, void *data, > int (*fn)(struct device *dev, void *data)); > extern struct device * > -iscsi_find_flashnode_conn(struct iscsi_bus_flash_session *fnode_sess); > +iscsi_find_flashnode_conn(struct iscsi_flash_session *fnode_sess); > + > +extern bool iscsi_is_flashnode_session_dev(struct device *dev); > > extern bool iscsi_is_flashnode_session_dev(struct device *dev); > > -- > 2.9.5 > > -- You received this message because you are subscribed to the Google Groups "open-iscsi" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at https://groups.google.com/group/open-iscsi. For more options, visit https://groups.google.com/d/optout.
