diff options
| author | Nicholas Swenson <nks@daterainc.com> | 2014-01-09 16:03:04 -0800 |
|---|---|---|
| committer | Kent Overstreet <kmo@daterainc.com> | 2014-03-18 12:22:33 -0700 |
| commit | da415a096fc06e49d1a15f7a06bcfe6ad44c5d38 (patch) | |
| tree | 54a5b937d4acd579f43b9dc062afd41ecaa33d82 /drivers/md/bcache/bcache.h | |
| parent | 90db6919f5f1614d1b7a92052445506bc6c564d2 (diff) | |
bcache: Fix moving_gc deadlocking with a foreground write
Deadlock happened because a foreground write slept, waiting for a bucket
to be allocated. Normally the gc would mark buckets available for invalidation.
But the moving_gc was stuck waiting for outstanding writes to complete.
These writes used the bcache_wq, the same queue foreground writes used.
This fix gives moving_gc its own work queue, so it was still finish moving
even if foreground writes are stuck waiting for allocation. It also makes
work queue a parameter to the data_insert path, so moving_gc can use its
workqueue for writes.
Signed-off-by: Nicholas Swenson <nks@daterainc.com>
Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Diffstat (limited to 'drivers/md/bcache/bcache.h')
| -rw-r--r-- | drivers/md/bcache/bcache.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h index a4c7306ff43d..6d814f463d9e 100644 --- a/drivers/md/bcache/bcache.h +++ b/drivers/md/bcache/bcache.h @@ -628,6 +628,8 @@ struct cache_set { /* Number of moving GC bios in flight */ struct semaphore moving_in_flight; + struct workqueue_struct *moving_gc_wq; + struct btree *root; #ifdef CONFIG_BCACHE_DEBUG |