From 254f91f29196e1ac73cdde895d5176e4379b9ba4 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Thu, 12 Nov 2015 01:08:06 +0000 Subject: [PATCH] scst: Fix race leading to extra device unblocking in mix of strictly serialized and TM commands git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6674 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/scst_lib.c | 2 -- scst/src/scst_targ.c | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c index 943b5c1b8..c026d02e0 100644 --- a/scst/src/scst_lib.c +++ b/scst/src/scst_lib.c @@ -12997,8 +12997,6 @@ void scst_unblock_dev(struct scst_device *dev) break; } local_irq_restore_nort(flags); - - dev->strictly_serialized_cmd_waiting = 0; } sBUG_ON(dev->block_count < 0); diff --git a/scst/src/scst_targ.c b/scst/src/scst_targ.c index b6198f78b..3f3ee4d24 100644 --- a/scst/src/scst_targ.c +++ b/scst/src/scst_targ.c @@ -547,6 +547,7 @@ void __scst_check_unblock_dev(struct scst_cmd *cmd) TRACE_BLOCK("Strictly serialized cmd waiting: " "unblocking dev %s", dev->virt_name); scst_unblock_dev(dev); + dev->strictly_serialized_cmd_waiting = 0; } }