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

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2017-01-10 17:52:45 -08:00
parent 473db9c997 4538bc1c81
commit cf185c85c0
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scst/src/scst_lib.c
View File

@@ -79,7 +79,6 @@ static void scst_put_acg_work(void *p);
#else
static void scst_put_acg_work(struct work_struct *work);
#endif
static void scst_del_acn(struct scst_acn *acn);
static void scst_free_acn(struct scst_acn *acn, bool reassign);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
@@ -4760,7 +4759,7 @@ out_free:
*/
static void scst_del_acg(struct scst_acg *acg)
{
struct scst_acn *acn, *acnt;
struct scst_acn *acn;
struct scst_acg_dev *acg_dev, *acg_dev_tmp;
scst_assert_activity_suspended();
@@ -4772,8 +4771,8 @@ static void scst_del_acg(struct scst_acg *acg)
acg_dev_list_entry)
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);
list_for_each_entry(acn, &acg->acn_list, acn_list_entry)
scst_acn_sysfs_del(acn);
#ifdef CONFIG_SCST_PROC
list_del(&acg->acg_list_entry);
@@ -5685,14 +5684,6 @@ out_free:
goto out;
}
/* The activity supposed to be suspended and scst_mutex held */
static void scst_del_acn(struct scst_acn *acn)
{
list_del(&acn->acn_list_entry);
scst_acn_sysfs_del(acn);
}
/* The activity supposed to be suspended and scst_mutex held */
static void scst_free_acn(struct scst_acn *acn, bool reassign)
{
@@ -5707,7 +5698,8 @@ static void scst_free_acn(struct scst_acn *acn, bool reassign)
void scst_del_free_acn(struct scst_acn *acn, bool reassign)
{
TRACE_ENTRY();
scst_del_acn(acn);
list_del(&acn->acn_list_entry);
scst_acn_sysfs_del(acn);
scst_free_acn(acn, reassign);
TRACE_EXIT();
return;