|
@@ -1113,9 +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(mg->cache);
|
|
|
+ wake_worker(cache);
|
|
|
}
|
|
|
|
|
|
static void migration_failure(struct dm_cache_migration *mg)
|
|
@@ -1342,17 +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, 0);
|
|
|
- cell_defer(mg->cache, mg->new_ocell, false);
|
|
|
+ cell_defer(cache, mg->new_ocell, false);
|
|
|
free_migration(mg);
|
|
|
- wake_worker(mg->cache);
|
|
|
+ wake_worker(cache);
|
|
|
}
|
|
|
|
|
|
static void issue_copy_or_discard(struct dm_cache_migration *mg)
|