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

Merge of the trunk's r2580:

Browse Source 
Let's be safe and alway do barrier



git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.0.0.x@2594 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2010-11-04 13:55:38 +00:00
parent 75766c6bb0
commit 4a80d3c0a5
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scst/src/scst_lib.c
View File

@@ -3707,7 +3707,7 @@ static struct scst_cmd *scst_create_prepare_internal_cmd(
scst_sess_get(res->sess);
if (res->tgt_dev != NULL)
__scst_get(0);
__scst_get();
res->state = SCST_CMD_STATE_PARSE;

2
scst/src/scst_main.c
View File

@@ -1969,7 +1969,7 @@ out_unlock:
*/
void scst_get(void)
{
__scst_get(0);
__scst_get();
}
EXPORT_SYMBOL(scst_get);

6
scst/src/scst_priv.h
View File

@@ -602,15 +602,13 @@ static inline void scst_check_unblock_dev(struct scst_cmd *cmd)
return;
}
static inline void __scst_get(int barrier)
static inline void __scst_get(void)
{
atomic_inc(&scst_cmd_count);
TRACE_DBG("Incrementing scst_cmd_count(new value %d)",
atomic_read(&scst_cmd_count));
/* See comment about smp_mb() in scst_suspend_activity() */
if (barrier)
smp_mb__after_atomic_inc();
smp_mb__after_atomic_inc();
}
static inline void __scst_put(void)

4
scst/src/scst_targ.c
View File

@@ -3775,7 +3775,7 @@ static int scst_translate_lun(struct scst_cmd *cmd)
TRACE_ENTRY();
/* See comment about smp_mb() in scst_suspend_activity() */
__scst_get(1);
__scst_get();
if (likely(!test_bit(SCST_FLAG_SUSPENDED, &scst_flags))) {
struct list_head *sess_tgt_dev_list_head =
@@ -4354,7 +4354,7 @@ static int scst_mgmt_translate_lun(struct scst_mgmt_cmd *mcmd)
(long long unsigned int)mcmd->lun);
/* See comment about smp_mb() in scst_suspend_activity() */
__scst_get(1);
__scst_get();
if (unlikely(test_bit(SCST_FLAG_SUSPENDED, &scst_flags) &&
!test_bit(SCST_FLAG_SUSPENDING, &scst_flags))) {