diff options
author | Kent Overstreet <kmo@daterainc.com> | 2013-09-24 02:17:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-24 17:41:43 -0400 |
commit | 79e3dab90d9f826ceca67c7890e048ac9169de49 (patch) | |
tree | aa3b27dad6f09cb32faa8c23ad3a3ca661a5ffae | |
parent | 1394d6761b6e9e15ee7c632a6d48791188727b40 (diff) |
bcache: Fix a dumb CPU spinning bug in writeback
schedule_timeout() != schedule_timeout_uninterruptible()
Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Cc: linux-stable <stable@vger.kernel.org> # >= v3.10
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/md/bcache/writeback.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/md/bcache/writeback.c b/drivers/md/bcache/writeback.c index 27ac51934822..ba3ee48320f2 100644 --- a/drivers/md/bcache/writeback.c +++ b/drivers/md/bcache/writeback.c | |||
@@ -397,8 +397,7 @@ static void read_dirty(struct closure *cl) | |||
397 | if (delay > 0 && | 397 | if (delay > 0 && |
398 | (KEY_START(&w->key) != dc->last_read || | 398 | (KEY_START(&w->key) != dc->last_read || |
399 | jiffies_to_msecs(delay) > 50)) | 399 | jiffies_to_msecs(delay) > 50)) |
400 | while (delay) | 400 | delay = schedule_timeout_uninterruptible(delay); |
401 | delay = schedule_timeout(delay); | ||
402 | 401 | ||
403 | dc->last_read = KEY_OFFSET(&w->key); | 402 | dc->last_read = KEY_OFFSET(&w->key); |
404 | 403 | ||