diff options
author | Kent Overstreet <kmo@daterainc.com> | 2013-09-24 02:17:33 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-05 10:13:09 -0400 |
commit | ff1a51b9bf5808f2d40b8e605ff7f7cdc7973b3e (patch) | |
tree | fb6ad0e390aac5ef9b05845a79c3e494a64b9927 /drivers/md | |
parent | 77dbabefd61a7db6dad630d59823dd610ac6692d (diff) |
bcache: Fix a dumb CPU spinning bug in writeback
commit 79e3dab90d9f826ceca67c7890e048ac9169de49 upstream.
schedule_timeout() != schedule_timeout_uninterruptible()
Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/md')
-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 12c0cd135ef8..841f0490d4ef 100644 --- a/drivers/md/bcache/writeback.c +++ b/drivers/md/bcache/writeback.c | |||
@@ -327,8 +327,7 @@ static void read_dirty(struct closure *cl) | |||
327 | if (delay > 0 && | 327 | if (delay > 0 && |
328 | (KEY_START(&w->key) != dc->last_read || | 328 | (KEY_START(&w->key) != dc->last_read || |
329 | jiffies_to_msecs(delay) > 50)) | 329 | jiffies_to_msecs(delay) > 50)) |
330 | while (delay) | 330 | delay = schedule_timeout_uninterruptible(delay); |
331 | delay = schedule_timeout(delay); | ||
332 | 331 | ||
333 | dc->last_read = KEY_OFFSET(&w->key); | 332 | dc->last_read = KEY_OFFSET(&w->key); |
334 | 333 | ||