diff options
| author | Greg Kroah-Hartman | 2018-05-08 09:47:16 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-05-08 09:47:16 +0200 |
| commit | 58318cd4df415aaeaad1a7306cf1d35dad9a21c3 (patch) | |
| tree | 794fef2338813360e0f535511f7d6f97a08254f0 /drivers/md/bcache/alloc.c | |
| parent | dcadfaf2127e067e87843ff688f4ae5674a8d607 (diff) | |
| parent | 75bc37fefc4471e718ba8e651aa74673d4e0a9eb (diff) | |
Merge 4.17-rc4 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/md/bcache/alloc.c')
| -rw-r--r-- | drivers/md/bcache/alloc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/md/bcache/alloc.c b/drivers/md/bcache/alloc.c index 004cc3cc6123..7fa2631b422c 100644 --- a/drivers/md/bcache/alloc.c +++ b/drivers/md/bcache/alloc.c @@ -290,7 +290,7 @@ do { \ if (kthread_should_stop() || \ test_bit(CACHE_SET_IO_DISABLE, &ca->set->flags)) { \ set_current_state(TASK_RUNNING); \ - return 0; \ + goto out; \ } \ \ schedule(); \ @@ -378,6 +378,9 @@ retry_invalidate: bch_prio_write(ca); } } +out: + wait_for_kthread_stop(); + return 0; } /* Allocation */ |