diff options
author | Jiri Kosina <jkosina@suse.cz> | 2018-10-23 13:19:54 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2018-10-23 13:19:54 +0200 |
commit | a600ffe6ec609b0600ec590236f97f8d430e0984 (patch) | |
tree | 57432877c74c80ab470d7b655a2e18a6b5168ee5 /drivers/md/bcache/journal.c | |
parent | d19031d32cd77b2878a006040e0f8e4183ca59ef (diff) | |
parent | 23e542e5ba5e4298a1475f94750317ec1662ba21 (diff) | |
download | talos-obmc-linux-a600ffe6ec609b0600ec590236f97f8d430e0984.tar.gz talos-obmc-linux-a600ffe6ec609b0600ec590236f97f8d430e0984.zip |
Merge branch 'for-4.20/google' into for-linus
Whisker device specific fixes to hid-google driver
Diffstat (limited to 'drivers/md/bcache/journal.c')
-rw-r--r-- | drivers/md/bcache/journal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/md/bcache/journal.c b/drivers/md/bcache/journal.c index 6116bbf870d8..522c7426f3a0 100644 --- a/drivers/md/bcache/journal.c +++ b/drivers/md/bcache/journal.c @@ -485,7 +485,7 @@ static void do_journal_discard(struct cache *ca) closure_get(&ca->set->cl); INIT_WORK(&ja->discard_work, journal_discard_work); - schedule_work(&ja->discard_work); + queue_work(bch_journal_wq, &ja->discard_work); } } @@ -592,7 +592,7 @@ static void journal_write_done(struct closure *cl) : &j->w[0]; __closure_wake_up(&w->wait); - continue_at_nobarrier(cl, journal_write, system_wq); + continue_at_nobarrier(cl, journal_write, bch_journal_wq); } static void journal_write_unlock(struct closure *cl) @@ -627,7 +627,7 @@ static void journal_write_unlocked(struct closure *cl) spin_unlock(&c->journal.lock); btree_flush_write(c); - continue_at(cl, journal_write, system_wq); + continue_at(cl, journal_write, bch_journal_wq); return; } |