forked from Minki/linux
scsi: target: Remove second argument from fabric_make_tpg()
Since most target drivers do not use the second fabric_make_tpg() argument ("group") and since it is trivial to derive the group pointer from the wwn pointer, do not pass the group pointer to fabric_make_tpg(). Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com> Reviewed-by: Mike Christie <mchristi@redhat.com> Cc: Felipe Balbi <felipe.balbi@linux.intel.com> Cc: Hannes Reinecke <hare@suse.com> Cc: Christoph Hellwig <hch@lst.de> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
parent
35bea5c84f
commit
aa090eabcb
@ -3597,11 +3597,9 @@ static struct configfs_attribute *srpt_tpg_attrs[] = {
|
||||
/**
|
||||
* srpt_make_tpg - configfs callback invoked for mkdir /sys/kernel/config/target/$driver/$port/$tpg
|
||||
* @wwn: Corresponds to $driver/$port.
|
||||
* @group: Not used.
|
||||
* @name: $tpg.
|
||||
*/
|
||||
static struct se_portal_group *srpt_make_tpg(struct se_wwn *wwn,
|
||||
struct config_group *group,
|
||||
const char *name)
|
||||
{
|
||||
struct srpt_port *sport = wwn->priv;
|
||||
|
@ -3928,7 +3928,6 @@ static void ibmvscsis_drop_tport(struct se_wwn *wwn)
|
||||
}
|
||||
|
||||
static struct se_portal_group *ibmvscsis_make_tpg(struct se_wwn *wwn,
|
||||
struct config_group *group,
|
||||
const char *name)
|
||||
{
|
||||
struct ibmvscsis_tport *tport =
|
||||
|
@ -1049,10 +1049,8 @@ static struct configfs_attribute *tcm_qla2xxx_tpg_attrs[] = {
|
||||
NULL,
|
||||
};
|
||||
|
||||
static struct se_portal_group *tcm_qla2xxx_make_tpg(
|
||||
struct se_wwn *wwn,
|
||||
struct config_group *group,
|
||||
const char *name)
|
||||
static struct se_portal_group *tcm_qla2xxx_make_tpg(struct se_wwn *wwn,
|
||||
const char *name)
|
||||
{
|
||||
struct tcm_qla2xxx_lport *lport = container_of(wwn,
|
||||
struct tcm_qla2xxx_lport, lport_wwn);
|
||||
@ -1171,10 +1169,8 @@ static struct configfs_attribute *tcm_qla2xxx_npiv_tpg_attrs[] = {
|
||||
NULL,
|
||||
};
|
||||
|
||||
static struct se_portal_group *tcm_qla2xxx_npiv_make_tpg(
|
||||
struct se_wwn *wwn,
|
||||
struct config_group *group,
|
||||
const char *name)
|
||||
static struct se_portal_group *tcm_qla2xxx_npiv_make_tpg(struct se_wwn *wwn,
|
||||
const char *name)
|
||||
{
|
||||
struct tcm_qla2xxx_lport *lport = container_of(wwn,
|
||||
struct tcm_qla2xxx_lport, lport_wwn);
|
||||
|
@ -1090,10 +1090,8 @@ static struct configfs_attribute *lio_target_tpg_attrs[] = {
|
||||
|
||||
/* Start items for lio_target_tiqn_cit */
|
||||
|
||||
static struct se_portal_group *lio_target_tiqn_addtpg(
|
||||
struct se_wwn *wwn,
|
||||
struct config_group *group,
|
||||
const char *name)
|
||||
static struct se_portal_group *lio_target_tiqn_addtpg(struct se_wwn *wwn,
|
||||
const char *name)
|
||||
{
|
||||
struct iscsi_portal_group *tpg;
|
||||
struct iscsi_tiqn *tiqn;
|
||||
|
@ -983,10 +983,8 @@ static struct configfs_attribute *tcm_loop_tpg_attrs[] = {
|
||||
|
||||
/* Start items for tcm_loop_naa_cit */
|
||||
|
||||
static struct se_portal_group *tcm_loop_make_naa_tpg(
|
||||
struct se_wwn *wwn,
|
||||
struct config_group *group,
|
||||
const char *name)
|
||||
static struct se_portal_group *tcm_loop_make_naa_tpg(struct se_wwn *wwn,
|
||||
const char *name)
|
||||
{
|
||||
struct tcm_loop_hba *tl_hba = container_of(wwn,
|
||||
struct tcm_loop_hba, tl_hba_wwn);
|
||||
|
@ -2006,10 +2006,8 @@ static void sbp_pre_unlink_lun(
|
||||
pr_err("unlink LUN: failed to update unit directory\n");
|
||||
}
|
||||
|
||||
static struct se_portal_group *sbp_make_tpg(
|
||||
struct se_wwn *wwn,
|
||||
struct config_group *group,
|
||||
const char *name)
|
||||
static struct se_portal_group *sbp_make_tpg(struct se_wwn *wwn,
|
||||
const char *name)
|
||||
{
|
||||
struct sbp_tport *tport =
|
||||
container_of(wwn, struct sbp_tport, tport_wwn);
|
||||
|
@ -841,7 +841,7 @@ static struct config_group *target_fabric_make_tpg(
|
||||
return ERR_PTR(-ENOSYS);
|
||||
}
|
||||
|
||||
se_tpg = tf->tf_ops->fabric_make_tpg(wwn, group, name);
|
||||
se_tpg = tf->tf_ops->fabric_make_tpg(wwn, name);
|
||||
if (!se_tpg || IS_ERR(se_tpg))
|
||||
return ERR_PTR(-EINVAL);
|
||||
|
||||
|
@ -223,10 +223,7 @@ static int ft_init_nodeacl(struct se_node_acl *nacl, const char *name)
|
||||
/*
|
||||
* local_port port_group (tpg) ops.
|
||||
*/
|
||||
static struct se_portal_group *ft_add_tpg(
|
||||
struct se_wwn *wwn,
|
||||
struct config_group *group,
|
||||
const char *name)
|
||||
static struct se_portal_group *ft_add_tpg(struct se_wwn *wwn, const char *name)
|
||||
{
|
||||
struct ft_lport_wwn *ft_wwn;
|
||||
struct ft_tpg *tpg;
|
||||
|
@ -1344,10 +1344,8 @@ static int usbg_init_nodeacl(struct se_node_acl *se_nacl, const char *name)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct se_portal_group *usbg_make_tpg(
|
||||
struct se_wwn *wwn,
|
||||
struct config_group *group,
|
||||
const char *name)
|
||||
static struct se_portal_group *usbg_make_tpg(struct se_wwn *wwn,
|
||||
const char *name)
|
||||
{
|
||||
struct usbg_tport *tport = container_of(wwn, struct usbg_tport,
|
||||
tport_wwn);
|
||||
@ -1380,7 +1378,7 @@ static struct se_portal_group *usbg_make_tpg(
|
||||
goto unlock_dep;
|
||||
} else {
|
||||
ret = configfs_depend_item_unlocked(
|
||||
group->cg_subsys,
|
||||
wwn->wwn_group.cg_subsys,
|
||||
&opts->func_inst.group.cg_item);
|
||||
if (ret)
|
||||
goto unlock_dep;
|
||||
|
@ -1912,9 +1912,7 @@ static struct configfs_attribute *vhost_scsi_tpg_attrs[] = {
|
||||
};
|
||||
|
||||
static struct se_portal_group *
|
||||
vhost_scsi_make_tpg(struct se_wwn *wwn,
|
||||
struct config_group *group,
|
||||
const char *name)
|
||||
vhost_scsi_make_tpg(struct se_wwn *wwn, const char *name)
|
||||
{
|
||||
struct vhost_scsi_tport *tport = container_of(wwn,
|
||||
struct vhost_scsi_tport, tport_wwn);
|
||||
|
@ -1732,9 +1732,7 @@ static void scsiback_port_unlink(struct se_portal_group *se_tpg,
|
||||
}
|
||||
|
||||
static struct se_portal_group *
|
||||
scsiback_make_tpg(struct se_wwn *wwn,
|
||||
struct config_group *group,
|
||||
const char *name)
|
||||
scsiback_make_tpg(struct se_wwn *wwn, const char *name)
|
||||
{
|
||||
struct scsiback_tport *tport = container_of(wwn,
|
||||
struct scsiback_tport, tport_wwn);
|
||||
|
@ -79,7 +79,7 @@ struct target_core_fabric_ops {
|
||||
void (*fabric_drop_wwn)(struct se_wwn *);
|
||||
void (*add_wwn_groups)(struct se_wwn *);
|
||||
struct se_portal_group *(*fabric_make_tpg)(struct se_wwn *,
|
||||
struct config_group *, const char *);
|
||||
const char *);
|
||||
void (*fabric_drop_tpg)(struct se_portal_group *);
|
||||
int (*fabric_post_link)(struct se_portal_group *,
|
||||
struct se_lun *);
|
||||
|
Loading…
Reference in New Issue
Block a user