diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-25 22:30:23 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-25 22:30:23 +0200 |
| commit | b8dcdab36f5394a09b66516057cccf61a81a3877 (patch) | |
| tree | e08659de431a585acd3804464535334161e5a8cc /drivers | |
| parent | Merge tag 'upstream-4.19-rc1-fix' of git://git.infradead.org/linux-ubifs (diff) | |
| parent | blk-wbt: don't maintain inflight counts if disabled (diff) | |
| download | linux-b8dcdab36f5394a09b66516057cccf61a81a3877.tar.xz linux-b8dcdab36f5394a09b66516057cccf61a81a3877.zip | |
Merge tag 'for-linus-20180825' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"A few small fixes for this merge window:
- Locking imbalance fix for bcache (Shan Hai)
- A few small fixes for wbt. One is a cleanup/prep, one is a fix for
an existing issue, and the last two are fixes for changes that went
into this merge window (me)"
* tag 'for-linus-20180825' of git://git.kernel.dk/linux-block:
blk-wbt: don't maintain inflight counts if disabled
blk-wbt: fix has-sleeper queueing check
blk-wbt: use wq_has_sleeper() for wq active check
blk-wbt: move disable check into get_limit()
bcache: release dc->writeback_lock properly in bch_writeback_thread()
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/md/bcache/writeback.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/md/bcache/writeback.c b/drivers/md/bcache/writeback.c index 6be05bd7ca67..08c3a9f9676c 100644 --- a/drivers/md/bcache/writeback.c +++ b/drivers/md/bcache/writeback.c @@ -685,8 +685,10 @@ static int bch_writeback_thread(void *arg) * data on cache. BCACHE_DEV_DETACHING flag is set in * bch_cached_dev_detach(). */ - if (test_bit(BCACHE_DEV_DETACHING, &dc->disk.flags)) + if (test_bit(BCACHE_DEV_DETACHING, &dc->disk.flags)) { + up_write(&dc->writeback_lock); break; + } } up_write(&dc->writeback_lock); |