From: Joe Thornber Date: Thu, 30 Jul 2015 08:29:40 +0000 (+0100) Subject: dm cache: move wake_waker() from free_migrations() to where it is needed X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e44b6a5a3c711c1ada4cf7135bf9dbf860caffd2;p=linux-beck.git dm cache: move wake_waker() from free_migrations() to where it is needed This stops spurious wake ups from calls to prealloc_free_structs(). Signed-off-by: Joe Thornber Signed-off-by: Mike Snitzer --- diff --git a/drivers/md/dm-cache-target.c b/drivers/md/dm-cache-target.c index 1fe93cfea7d3..8cef66b33243 100644 --- a/drivers/md/dm-cache-target.c +++ b/drivers/md/dm-cache-target.c @@ -424,7 +424,6 @@ static void free_migration(struct dm_cache_migration *mg) wake_up(&cache->migration_wait); mempool_free(mg, cache->migration_pool); - wake_worker(cache); } static int prealloc_data_structs(struct cache *cache, struct prealloc *p) @@ -1125,6 +1124,7 @@ static void free_io_migration(struct dm_cache_migration *mg) { dec_io_migrations(mg->cache); free_migration(mg); + wake_worker(mg->cache); } static void migration_failure(struct dm_cache_migration *mg) @@ -1361,6 +1361,7 @@ static void issue_discard(struct dm_cache_migration *mg) bio_endio(bio, 0); cell_defer(mg->cache, mg->new_ocell, false); free_migration(mg); + wake_worker(mg->cache); } static void issue_copy_or_discard(struct dm_cache_migration *mg)