summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorMaxim Levitsky <maximlevitsky@gmail.com>2010-10-15 17:20:45 +0200
committerDavid Woodhouse <David.Woodhouse@intel.com>2010-10-25 02:28:52 +0200
commit12aebf3e1ad7dc8b076dd9674ca98f1aa6859fcd (patch)
tree545b9655e797629fa3baff874aebb866cd1c67ec /drivers/mtd
parentmtd: blktrans: kill BKL (diff)
downloadlinux-12aebf3e1ad7dc8b076dd9674ca98f1aa6859fcd.tar.xz
linux-12aebf3e1ad7dc8b076dd9674ca98f1aa6859fcd.zip
mtd: blktrans: fix a race vs kthread_stop
There is small race window that could make kthread_stop hang forever. I found that while hacking the IR subsystem. Signed-off-by: Maxim Levitsky <maximlevisky@gmail.com> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/mtd_blkdevs.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
index 040c2d923807..a919587ed481 100644
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
@@ -133,6 +133,10 @@ static int mtd_blktrans_thread(void *arg)
if (!req && !(req = blk_fetch_request(rq))) {
set_current_state(TASK_INTERRUPTIBLE);
+
+ if (kthread_should_stop())
+ set_current_state(TASK_RUNNING);
+
spin_unlock_irq(rq->queue_lock);
schedule();
spin_lock_irq(rq->queue_lock);