hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scsi: target: rename target_alloc_session 

Rename target_alloc_session to target_setup_session to avoid confusion with
the other transport session allocation function that only allocates the
session and because the target_alloc_session does so much more. It
allocates the session, sets up the nacl and registers the session.

The next patch will then add a remove function to match the setup in this
one, so it should make sense for all drivers, except iscsi, to just call
those 2 functions to setup and remove a session.

iscsi will continue to be the odd driver.

Signed-off-by: Mike Christie <mchristi@redhat.com>
Reviewed-by: Bart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: Chris Boot <bootc@bootc.net>
Cc: Bryant G. Ly <bryantly@linux.vnet.ibm.com>
Cc: Michael Cyr <mikecyr@linux.vnet.ibm.com>
Cc: <qla2xxx-upstream@qlogic.com>
Cc: Johannes Thumshirn <jth@kernel.org>
Cc: Felipe Balbi <balbi@kernel.org>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Mike Christie 2018-08-02 12:12:23 -05:00 committed by Martin K. Petersen
parent 3cd14285a1
commit fa83428730
11 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/infiniband/ulp/srpt/ib_srpt.c
View File

@ -2221,16 +2221,16 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
pr_debug("registering session %s\n", ch->sess_name); pr_debug("registering session %s\n", ch->sess_name);
if (sport->port_guid_tpg.se_tpg_wwn) if (sport->port_guid_tpg.se_tpg_wwn)
ch->sess = target_alloc_session(&sport->port_guid_tpg, 0, 0, ch->sess = target_setup_session(&sport->port_guid_tpg, 0, 0,
TARGET_PROT_NORMAL, TARGET_PROT_NORMAL,
ch->sess_name, ch, NULL); ch->sess_name, ch, NULL);
if (sport->port_gid_tpg.se_tpg_wwn && IS_ERR_OR_NULL(ch->sess)) if (sport->port_gid_tpg.se_tpg_wwn && IS_ERR_OR_NULL(ch->sess))
ch->sess = target_alloc_session(&sport->port_gid_tpg, 0, 0, ch->sess = target_setup_session(&sport->port_gid_tpg, 0, 0,
TARGET_PROT_NORMAL, i_port_id, ch, TARGET_PROT_NORMAL, i_port_id, ch,
NULL); NULL);
/* Retry without leading "0x" */ /* Retry without leading "0x" */
if (sport->port_gid_tpg.se_tpg_wwn && IS_ERR_OR_NULL(ch->sess)) if (sport->port_gid_tpg.se_tpg_wwn && IS_ERR_OR_NULL(ch->sess))
ch->sess = target_alloc_session(&sport->port_gid_tpg, 0, 0, ch->sess = target_setup_session(&sport->port_gid_tpg, 0, 0,
TARGET_PROT_NORMAL, TARGET_PROT_NORMAL,
i_port_id + 2, ch, NULL); i_port_id + 2, ch, NULL);
if (IS_ERR_OR_NULL(ch->sess)) { if (IS_ERR_OR_NULL(ch->sess)) {

2
drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c
View File

@ -2233,7 +2233,7 @@ static int ibmvscsis_make_nexus(struct ibmvscsis_tport *tport)
return -ENOMEM; return -ENOMEM;
} }
nexus->se_sess = target_alloc_session(&tport->se_tpg, 0, 0, nexus->se_sess = target_setup_session(&tport->se_tpg, 0, 0,
TARGET_PROT_NORMAL, name, nexus, TARGET_PROT_NORMAL, name, nexus,
NULL); NULL);
if (IS_ERR(nexus->se_sess)) { if (IS_ERR(nexus->se_sess)) {

2
drivers/scsi/qla2xxx/tcm_qla2xxx.c
View File

@ -1539,7 +1539,7 @@ static int tcm_qla2xxx_check_initiator_node_acl(
* Locate our struct se_node_acl either from an explict NodeACL created * Locate our struct se_node_acl either from an explict NodeACL created
* via ConfigFS, or via running in TPG demo mode. * via ConfigFS, or via running in TPG demo mode.
*/ */
se_sess = target_alloc_session(&tpg->se_tpg, num_tags, se_sess = target_setup_session(&tpg->se_tpg, num_tags,
sizeof(struct qla_tgt_cmd), sizeof(struct qla_tgt_cmd),
TARGET_PROT_ALL, port_name, TARGET_PROT_ALL, port_name,
qlat_sess, tcm_qla2xxx_session_cb); qlat_sess, tcm_qla2xxx_session_cb);

2
drivers/target/loopback/tcm_loop.c
View File

@ -765,7 +765,7 @@ static int tcm_loop_make_nexus(
if (!tl_nexus) if (!tl_nexus)
return -ENOMEM; return -ENOMEM;
tl_nexus->se_sess = target_alloc_session(&tl_tpg->tl_se_tpg, 0, 0, tl_nexus->se_sess = target_setup_session(&tl_tpg->tl_se_tpg, 0, 0,
TARGET_PROT_DIN_PASS | TARGET_PROT_DOUT_PASS, TARGET_PROT_DIN_PASS | TARGET_PROT_DOUT_PASS,
name, tl_nexus, tcm_loop_alloc_sess_cb); name, tl_nexus, tcm_loop_alloc_sess_cb);
if (IS_ERR(tl_nexus->se_sess)) { if (IS_ERR(tl_nexus->se_sess)) {

2
drivers/target/sbp/sbp_target.c
View File

@ -209,7 +209,7 @@ static struct sbp_session *sbp_session_create(
INIT_DELAYED_WORK(&sess->maint_work, session_maintenance_work); INIT_DELAYED_WORK(&sess->maint_work, session_maintenance_work);
sess->guid = guid; sess->guid = guid;
sess->se_sess = target_alloc_session(&tpg->se_tpg, 128, sess->se_sess = target_setup_session(&tpg->se_tpg, 128,
sizeof(struct sbp_target_request), sizeof(struct sbp_target_request),
TARGET_PROT_NORMAL, guid_str, TARGET_PROT_NORMAL, guid_str,
sess, NULL); sess, NULL);

4
drivers/target/target_core_transport.c
View File

@ -416,7 +416,7 @@ void transport_register_session(
EXPORT_SYMBOL(transport_register_session); EXPORT_SYMBOL(transport_register_session);
struct se_session * struct se_session *
target_alloc_session(struct se_portal_group *tpg, target_setup_session(struct se_portal_group *tpg,
unsigned int tag_num, unsigned int tag_size, unsigned int tag_num, unsigned int tag_size,
enum target_prot_op prot_op, enum target_prot_op prot_op,
const char *initiatorname, void *private, const char *initiatorname, void *private,
@ -458,7 +458,7 @@ target_alloc_session(struct se_portal_group *tpg,
transport_register_session(tpg, sess->se_node_acl, sess, private); transport_register_session(tpg, sess->se_node_acl, sess, private);
return sess; return sess;
} }
EXPORT_SYMBOL(target_alloc_session); EXPORT_SYMBOL(target_setup_session);
ssize_t target_show_dynamic_sessions(struct se_portal_group *se_tpg, char *page) ssize_t target_show_dynamic_sessions(struct se_portal_group *se_tpg, char *page)
{ {

2
drivers/target/tcm_fc/tfc_sess.c
View File

@ -239,7 +239,7 @@ static struct ft_sess *ft_sess_create(struct ft_tport *tport, u32 port_id,
sess->tport = tport; sess->tport = tport;
sess->port_id = port_id; sess->port_id = port_id;
sess->se_sess = target_alloc_session(se_tpg, TCM_FC_DEFAULT_TAGS, sess->se_sess = target_setup_session(se_tpg, TCM_FC_DEFAULT_TAGS,
sizeof(struct ft_cmd), sizeof(struct ft_cmd),
TARGET_PROT_NORMAL, &initiatorname[0], TARGET_PROT_NORMAL, &initiatorname[0],
sess, ft_sess_alloc_cb); sess, ft_sess_alloc_cb);

2
drivers/usb/gadget/function/f_tcm.c
View File

@ -1592,7 +1592,7 @@ static int tcm_usbg_make_nexus(struct usbg_tpg *tpg, char *name)
goto out_unlock; goto out_unlock;
} }
tv_nexus->tvn_se_sess = target_alloc_session(&tpg->se_tpg, tv_nexus->tvn_se_sess = target_setup_session(&tpg->se_tpg,
USB_G_DEFAULT_SESSION_TAGS, USB_G_DEFAULT_SESSION_TAGS,
sizeof(struct usbg_cmd), sizeof(struct usbg_cmd),
TARGET_PROT_NORMAL, name, TARGET_PROT_NORMAL, name,

2
drivers/vhost/scsi.c
View File

@ -1738,7 +1738,7 @@ static int vhost_scsi_make_nexus(struct vhost_scsi_tpg *tpg,
* struct se_node_acl for the vhost_scsi struct se_portal_group with * struct se_node_acl for the vhost_scsi struct se_portal_group with
* the SCSI Initiator port name of the passed configfs group 'name'. * the SCSI Initiator port name of the passed configfs group 'name'.
*/ */
tv_nexus->tvn_se_sess = target_alloc_session(&tpg->se_tpg, tv_nexus->tvn_se_sess = target_setup_session(&tpg->se_tpg,
VHOST_SCSI_DEFAULT_TAGS, VHOST_SCSI_DEFAULT_TAGS,
sizeof(struct vhost_scsi_cmd), sizeof(struct vhost_scsi_cmd),
TARGET_PROT_DIN_PASS | TARGET_PROT_DOUT_PASS, TARGET_PROT_DIN_PASS | TARGET_PROT_DOUT_PASS,

2
drivers/xen/xen-scsiback.c
View File

@ -1521,7 +1521,7 @@ static int scsiback_make_nexus(struct scsiback_tpg *tpg,
goto out_unlock; goto out_unlock;
} }
tv_nexus->tvn_se_sess = target_alloc_session(&tpg->se_tpg, tv_nexus->tvn_se_sess = target_setup_session(&tpg->se_tpg,
VSCSI_DEFAULT_SESSION_TAGS, VSCSI_DEFAULT_SESSION_TAGS,
sizeof(struct vscsibk_pend), sizeof(struct vscsibk_pend),
TARGET_PROT_NORMAL, name, TARGET_PROT_NORMAL, name,

2
include/target/target_core_fabric.h
View File

@ -109,7 +109,7 @@ void target_unregister_template(const struct target_core_fabric_ops *fo);
int target_depend_item(struct config_item *item); int target_depend_item(struct config_item *item);
void target_undepend_item(struct config_item *item); void target_undepend_item(struct config_item *item);
struct se_session *target_alloc_session(struct se_portal_group *, struct se_session *target_setup_session(struct se_portal_group *,
unsigned int, unsigned int, enum target_prot_op prot_op, unsigned int, unsigned int, enum target_prot_op prot_op,
const char *, void *, const char *, void *,
int (*callback)(struct se_portal_group *, int (*callback)(struct se_portal_group *,