Skip to content

Commit

Permalink
[SCSI] target: Remove unnecessary hba_dev_list walk and se_clear_dev_…
Browse files Browse the repository at this point in the history
…ports legacy code

This patch removes a legacy struct se_hba->hba_dev_list -> se_release_device_for_hba()
list walk in core_delete_hba(), which is no longer required while using configfs
VFS level parent/child struct config_group dependency referencing.  The reason
is because any struct se_hba->hba_dev_list-> struct se_device members are going
to have to be released via:

	rmdir /sys/kernel/config/target/core/$HBA/*

before rmdir release of struct se_hba via target_core_configfs.c:
target_core_call_delhbafromtarget() -> core_delete_hba()

	rmdir /sys/kernel/config/target/core/$HBA

to release struct se_hba in core_delete_hba().

This patch also removes the legacy se_clear_dev_ports() function, which is
left-over pre-configfs shutdown logic for when se_free_virtual_device()
was responsible for walking struct se_device->dev_sep_list and calling
core_dev_del_lun() for each individual active struct se_port->se_lun.

The reason this can be removed is because all struct se_device->dev_sep_list
-> struct se_port communication is done via configfs symlinks, which
means that an target fabric module's endpoints containg active struct
se_port(s) will have to be released via target_core_fabric_configfs.c:
target_fabric_port_unlink() via:

	unlink /sys/kernel/config/target/$FABRIC_MOD/$ENDPOINT/tpgt_$TPGT/lun/lun_$LUN_ID/<symlink>

before rmdir release of struct se_device in target_core_configfs.c:
target_core_drop_subdev() -> se_free_virtual_device() can happen via:

	rmdir /sys/kernel/config/target/core/$HBA/*

to release struct se_subsystem_dev in target_core_drop_subdev()

Reported-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Reported-by: Fubo Chen <fubo.chen@gmail.com>
Signed-off-by: Nicholas A. Bellinger <nab@linux-iscsi.org>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
  • Loading branch information
Fubo Chen authored and James Bottomley committed Mar 23, 2011
1 parent 613640e commit 05aea6e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 50 deletions.
39 changes: 2 additions & 37 deletions drivers/target/target_core_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -779,49 +779,14 @@ void se_release_vpd_for_dev(struct se_device *dev)
return;
}

/*
* Called with struct se_hba->device_lock held.
*/
void se_clear_dev_ports(struct se_device *dev)
{
struct se_hba *hba = dev->se_hba;
struct se_lun *lun;
struct se_portal_group *tpg;
struct se_port *sep, *sep_tmp;

spin_lock(&dev->se_port_lock);
list_for_each_entry_safe(sep, sep_tmp, &dev->dev_sep_list, sep_list) {
spin_unlock(&dev->se_port_lock);
spin_unlock(&hba->device_lock);

lun = sep->sep_lun;
tpg = sep->sep_tpg;
spin_lock(&lun->lun_sep_lock);
if (lun->lun_se_dev == NULL) {
spin_unlock(&lun->lun_sep_lock);
continue;
}
spin_unlock(&lun->lun_sep_lock);

core_dev_del_lun(tpg, lun->unpacked_lun);

spin_lock(&hba->device_lock);
spin_lock(&dev->se_port_lock);
}
spin_unlock(&dev->se_port_lock);

return;
}

/* se_free_virtual_device():
*
* Used for IBLOCK, RAMDISK, and FILEIO Transport Drivers.
*/
int se_free_virtual_device(struct se_device *dev, struct se_hba *hba)
{
spin_lock(&hba->device_lock);
se_clear_dev_ports(dev);
spin_unlock(&hba->device_lock);
if (!list_empty(&dev->dev_sep_list))
dump_stack();

core_alua_free_lu_gp_mem(dev);
se_release_device_for_hba(dev);
Expand Down
15 changes: 2 additions & 13 deletions drivers/target/target_core_hba.c
Original file line number Diff line number Diff line change
Expand Up @@ -151,19 +151,8 @@ core_alloc_hba(const char *plugin_name, u32 plugin_dep_id, u32 hba_flags)
int
core_delete_hba(struct se_hba *hba)
{
struct se_device *dev, *dev_tmp;

spin_lock(&hba->device_lock);
list_for_each_entry_safe(dev, dev_tmp, &hba->hba_dev_list, dev_list) {

se_clear_dev_ports(dev);
spin_unlock(&hba->device_lock);

se_release_device_for_hba(dev);

spin_lock(&hba->device_lock);
}
spin_unlock(&hba->device_lock);
if (!list_empty(&hba->hba_dev_list))
dump_stack();

hba->transport->detach_hba(hba);

Expand Down

0 comments on commit 05aea6e

Please sign in to comment.