Merge remote-tracking branches 'asoc/fix/mtk', 'asoc/fix/psc', 'asoc/fix/pxa', 'asoc...

[firefly-linux-kernel-4.4.55.git] / drivers / md / dm-cache-target.c

diff --git a/drivers/md/dm-cache-target.c b/drivers/md/dm-cache-target.c
index 7245071778dba2f28bac62057f7b2bb444fc56e3..dd90d1236f4a46be1cf28d7ef8ebc5d64235adf7 100644 (file)
--- 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)
@@ -1064,14 +1063,6 @@ static void dec_io_migrations(struct cache *cache)
        atomic_dec(&cache->nr_io_migrations);
 }
 
-static void __cell_release(struct cache *cache, struct dm_bio_prison_cell *cell,
-                          bool holder, struct bio_list *bios)
-{
-       (holder ? dm_cell_release : dm_cell_release_no_holder)
-               (cache->prison, cell, bios);
-       free_prison_cell(cache, cell);
-}
-
 static bool discard_or_flush(struct bio *bio)
 {
        return bio->bi_rw & (REQ_FLUSH | REQ_FUA | REQ_DISCARD);
@@ -1079,14 +1070,13 @@ static bool discard_or_flush(struct bio *bio)
 
 static void __cell_defer(struct cache *cache, struct dm_bio_prison_cell *cell)
 {
-       if (discard_or_flush(cell->holder))
+       if (discard_or_flush(cell->holder)) {
                /*
-                * We have to handle these bios
-                * individually.
+                * We have to handle these bios individually.
                 */
-               __cell_release(cache, cell, true, &cache->deferred_bios);
-
-       else
+               dm_cell_release(cache->prison, cell, &cache->deferred_bios);
+               free_prison_cell(cache, cell);
+       } else
                list_add_tail(&cell->user_list, &cache->deferred_cells);
 }
 
@@ -1113,7 +1103,7 @@ static void cell_defer(struct cache *cache, struct dm_bio_prison_cell *cell, boo
 static void cell_error_with_code(struct cache *cache, struct dm_bio_prison_cell *cell, int err)
 {
        dm_cell_error(cache->prison, cell, err);
-       dm_bio_prison_free_cell(cache->prison, cell);
+       free_prison_cell(cache, cell);
 }
 
 static void cell_requeue(struct cache *cache, struct dm_bio_prison_cell *cell)
@@ -1123,8 +1113,11 @@ static void cell_requeue(struct cache *cache, struct dm_bio_prison_cell *cell)
 
 static void free_io_migration(struct dm_cache_migration *mg)
 {
-       dec_io_migrations(mg->cache);
+       struct cache *cache = mg->cache;
+
+       dec_io_migrations(cache);
        free_migration(mg);
+       wake_worker(cache);
 }
 
 static void migration_failure(struct dm_cache_migration *mg)
@@ -1351,16 +1344,18 @@ static void issue_discard(struct dm_cache_migration *mg)
 {
        dm_dblock_t b, e;
        struct bio *bio = mg->new_ocell->holder;
+       struct cache *cache = mg->cache;
 
-       calc_discard_block_range(mg->cache, bio, &b, &e);
+       calc_discard_block_range(cache, bio, &b, &e);
        while (b != e) {
-               set_discard(mg->cache, b);
+               set_discard(cache, b);
                b = to_dblock(from_dblock(b) + 1);
        }
 
        bio_endio(bio);
-       cell_defer(mg->cache, mg->new_ocell, false);
+       cell_defer(cache, mg->new_ocell, false);
        free_migration(mg);
+       wake_worker(cache);
 }
 
 static void issue_copy_or_discard(struct dm_cache_migration *mg)
@@ -1729,6 +1724,8 @@ static void remap_cell_to_origin_clear_discard(struct cache *cache,
                remap_to_origin(cache, bio);
                issue(cache, bio);
        }
+
+       free_prison_cell(cache, cell);
 }
 
 static void remap_cell_to_cache_dirty(struct cache *cache, struct dm_bio_prison_cell *cell,
@@ -1763,6 +1760,8 @@ static void remap_cell_to_cache_dirty(struct cache *cache, struct dm_bio_prison_
                remap_to_cache(cache, bio, cblock);
                issue(cache, bio);
        }
+
+       free_prison_cell(cache, cell);
 }
 
 /*----------------------------------------------------------------*/