mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-19 03:31:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

scst_lib: Move more functionality into scst_del_acg_dev()

Browse Source 
This patch does not change any functionality.

Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
This commit is contained in:
Bart Van Assche
2015-05-04 09:34:42 +02:00
parent 691daf7c04
commit 7ac6a64fa8
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scst/src/scst_lib.c
View File

@@ -4083,11 +4083,17 @@ out:
* The activity supposed to be suspended and scst_mutex held or the
* corresponding target supposed to be stopped.
*/
static void scst_del_acg_dev(struct scst_acg_dev *acg_dev, bool del_sysfs)
static void scst_del_acg_dev(struct scst_acg_dev *acg_dev,
bool del_acg_dev_list, bool del_sysfs)
{
TRACE_DBG("Removing acg_dev %p from dev_acg_dev_list", acg_dev);
list_del(&acg_dev->dev_acg_dev_list_entry);
if (del_acg_dev_list) {
TRACE_DBG("Removing acg_dev %p from acg_dev_list", acg_dev);
list_del(&acg_dev->acg_dev_list_entry);
}
if (del_sysfs)
scst_acg_dev_sysfs_del(acg_dev);
}
@@ -4108,9 +4114,7 @@ static void scst_free_acg_dev(struct scst_acg_dev *acg_dev)
static void scst_del_free_acg_dev(struct scst_acg_dev *acg_dev, bool del_sysfs)
{
TRACE_ENTRY();
TRACE_DBG("Removing acg_dev %p from acg_dev_list", acg_dev);
list_del(&acg_dev->acg_dev_list_entry);
scst_del_acg_dev(acg_dev, del_sysfs);
scst_del_acg_dev(acg_dev, true, del_sysfs);
scst_free_acg_dev(acg_dev);
TRACE_EXIT();
return;
@@ -4397,7 +4401,7 @@ static void scst_del_acg(struct scst_acg *acg)
list_for_each_entry_safe(acg_dev, acg_dev_tmp, &acg->acg_dev_list,
acg_dev_list_entry)
scst_del_acg_dev(acg_dev, true);
scst_del_acg_dev(acg_dev, false, true);
list_for_each_entry_safe(acn, acnt, &acg->acn_list, acn_list_entry)
scst_del_acn(acn);