mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-19 13:46:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed scst_suspend_activity() lockdep annotations.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2888 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2010-12-01 09:56:32 +00:00
parent d83c11c1a3
commit 8773b01fde
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scst/src/scst_main.c
+14 -14
View File
@@ -147,10 +147,10 @@ struct list_head scst_sess_shut_list;
wait_queue_head_t scst_dev_cmd_waitQ;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
#ifdef CONFIG_DEBUG_LOCK_ALLOC
static struct lockdep_map scst_suspend_dep_map = {
.name = "scst_suspend_activity"
};
#ifdef CONFIG_LOCKDEP
static struct lock_class_key scst_suspend_key;
static struct lockdep_map scst_suspend_dep_map =
STATIC_LOCKDEP_MAP_INIT("scst_suspend_activity", &scst_suspend_key);
#endif
#endif
static struct mutex scst_suspend_mutex;
@@ -713,7 +713,7 @@ int scst_suspend_activity(bool interruptible)
TRACE_ENTRY();
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
mutex_acquire(&scst_suspend_dep_map, 0, 0/*try*/, _RET_IP_);
rwlock_acquire_read(&scst_suspend_dep_map, 0, 0, _RET_IP_);
#endif
if (interruptible) {
@@ -758,6 +758,10 @@ int scst_suspend_activity(bool interruptible)
"program recovers and starts responding or gets "
"killed.", atomic_read(&scst_cmd_count));
rep = true;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
lock_contended(&scst_suspend_dep_map, _RET_IP_);
#endif
}
res = scst_susp_wait(interruptible);
@@ -771,10 +775,6 @@ int scst_suspend_activity(bool interruptible)
TRACE_MGMT_DBG("Waiting for %d active commands finally to complete",
atomic_read(&scst_cmd_count));
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
lock_contended(&scst_suspend_dep_map, _RET_IP_);
#endif
res = scst_susp_wait(interruptible);
if (res != 0)
goto out_clear;
@@ -790,7 +790,7 @@ out:
if (res == 0)
lock_acquired(&scst_suspend_dep_map, _RET_IP_);
else
mutex_release(&scst_suspend_dep_map, 1/*nested*/, _RET_IP_);
rwlock_release(&scst_suspend_dep_map, 1, _RET_IP_);
#endif
TRACE_EXIT_RES(res);
@@ -810,10 +810,6 @@ static void __scst_resume_activity(void)
TRACE_ENTRY();
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
mutex_release(&scst_suspend_dep_map, 1/*nested*/, _RET_IP_);
#endif
suspend_count--;
TRACE_MGMT_DBG("suspend_count %d left", suspend_count);
if (suspend_count > 0)
@@ -857,6 +853,10 @@ void scst_resume_activity(void)
{
TRACE_ENTRY();
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
rwlock_release(&scst_suspend_dep_map, 1, _RET_IP_);
#endif
mutex_lock(&scst_suspend_mutex);
__scst_resume_activity();
mutex_unlock(&scst_suspend_mutex);