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-02-23 23:08:18 -08:00
parent bc85808150 95fe66fbeb
commit 425f4ab3f2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scst/src/scst_copy_mgr.c
View File

@@ -2738,7 +2738,6 @@ int scst_cm_on_add_acg(struct scst_acg *acg)
TRACE_ENTRY();
scst_assert_activity_suspended();
lockdep_assert_held(&scst_mutex);
if (scst_cm_tgt == NULL)
@@ -2824,7 +2823,7 @@ static bool scst_cm_check_access_acg(const char *initiator_name,
TRACE_ENTRY();
scst_assert_activity_suspended();
lockdep_assert_held(&scst_mutex);
lockdep_assert_held(&scst_mutex2);
list_for_each_entry(acg_dev, &acg->acg_dev_list, acg_dev_list_entry) {
if (acg_dev->dev == dev) {

3
scst/src/scst_lib.c
View File

@@ -4669,7 +4669,6 @@ out:
return res;
}
/* The activity supposed to be suspended and scst_mutex held */
int scst_alloc_add_acg(struct scst_tgt *tgt, const char *acg_name,
bool tgt_acg, struct scst_acg **out_acg)
{
@@ -4678,6 +4677,8 @@ int scst_alloc_add_acg(struct scst_tgt *tgt, const char *acg_name,
TRACE_ENTRY();
lockdep_assert_held(&scst_mutex);
acg = kzalloc(sizeof(*acg), GFP_KERNEL);
if (acg == NULL) {
PRINT_ERROR("%s", "Allocation of acg failed");