Commit e44b6a5a authored by Joe Thornber's avatar Joe Thornber Committed by Mike Snitzer

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: default avatarJoe Thornber <ejt@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent 8c747fd0
...@@ -424,7 +424,6 @@ static void free_migration(struct dm_cache_migration *mg) ...@@ -424,7 +424,6 @@ static void free_migration(struct dm_cache_migration *mg)
wake_up(&cache->migration_wait); wake_up(&cache->migration_wait);
mempool_free(mg, cache->migration_pool); mempool_free(mg, cache->migration_pool);
wake_worker(cache);
} }
static int prealloc_data_structs(struct cache *cache, struct prealloc *p) 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) ...@@ -1125,6 +1124,7 @@ static void free_io_migration(struct dm_cache_migration *mg)
{ {
dec_io_migrations(mg->cache); dec_io_migrations(mg->cache);
free_migration(mg); free_migration(mg);
wake_worker(mg->cache);
} }
static void migration_failure(struct dm_cache_migration *mg) static void migration_failure(struct dm_cache_migration *mg)
...@@ -1361,6 +1361,7 @@ static void issue_discard(struct dm_cache_migration *mg) ...@@ -1361,6 +1361,7 @@ static void issue_discard(struct dm_cache_migration *mg)
bio_endio(bio, 0); bio_endio(bio, 0);
cell_defer(mg->cache, mg->new_ocell, false); cell_defer(mg->cache, mg->new_ocell, false);
free_migration(mg); free_migration(mg);
wake_worker(mg->cache);
} }
static void issue_copy_or_discard(struct dm_cache_migration *mg) static void issue_copy_or_discard(struct dm_cache_migration *mg)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment