diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-12 20:02:18 -0400 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-12 20:02:18 -0400 |
| commit | 9277bf4b4f94655eef177d0daffa90a47c51eb62 (patch) | |
| tree | 569b5a13b3f7030a603460d8d9ded035a6f7f48f /fs/fs-writeback.c | |
| parent | 897493504addc5609f04a2c4f73c37ab972c29b2 (diff) | |
| parent | 49553c2ef88749dd502687f4eb9c258bb10a4f44 (diff) | |
Merge remote branch 'linus' into drm-intel-fixes
Diffstat (limited to 'fs/fs-writeback.c')
| -rw-r--r-- | fs/fs-writeback.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index 7d9d06ba184b..81e086d8aa57 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c | |||
| @@ -808,7 +808,7 @@ int bdi_writeback_thread(void *data) | |||
| 808 | wb->last_active = jiffies; | 808 | wb->last_active = jiffies; |
| 809 | 809 | ||
| 810 | set_current_state(TASK_INTERRUPTIBLE); | 810 | set_current_state(TASK_INTERRUPTIBLE); |
| 811 | if (!list_empty(&bdi->work_list)) { | 811 | if (!list_empty(&bdi->work_list) || kthread_should_stop()) { |
| 812 | __set_current_state(TASK_RUNNING); | 812 | __set_current_state(TASK_RUNNING); |
| 813 | continue; | 813 | continue; |
| 814 | } | 814 | } |