From: Joe Thornber Rename cell_defer_except() to cell_defer_no_holder() which describes its function more clearly. Signed-off-by: Joe Thornber Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon --- drivers/md/dm-thin.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) Index: linux/drivers/md/dm-thin.c =================================================================== --- linux.orig/drivers/md/dm-thin.c +++ linux/drivers/md/dm-thin.c @@ -526,7 +526,7 @@ static void cell_defer(struct thin_c *tc /* * Same as cell_defer except it omits the original holder of the cell. */ -static void cell_defer_except(struct thin_c *tc, struct dm_bio_prison_cell *cell) +static void cell_defer_no_holder(struct thin_c *tc, struct dm_bio_prison_cell *cell) { struct bio_list bios; struct pool *pool = tc->pool; @@ -583,7 +583,7 @@ static void process_prepared_mapping(str * the bios in the cell. */ if (bio) { - cell_defer_except(tc, m->cell); + cell_defer_no_holder(tc, m->cell); bio_endio(bio, 0); } else cell_defer(tc, m->cell, m->data_block); @@ -598,8 +598,8 @@ static void process_prepared_discard_fai struct thin_c *tc = m->tc; bio_io_error(m->bio); - cell_defer_except(tc, m->cell); - cell_defer_except(tc, m->cell2); + cell_defer_no_holder(tc, m->cell); + cell_defer_no_holder(tc, m->cell2); mempool_free(m, tc->pool->mapping_pool); } @@ -608,8 +608,8 @@ static void process_prepared_discard_pas struct thin_c *tc = m->tc; inc_all_io_entry(tc->pool, m->bio); - cell_defer_except(tc, m->cell); - cell_defer_except(tc, m->cell2); + cell_defer_no_holder(tc, m->cell); + cell_defer_no_holder(tc, m->cell2); if (m->pass_discard) remap_and_issue(tc, m->bio, m->data_block); @@ -950,7 +950,7 @@ static void process_discard(struct thin_ */ build_data_key(tc->td, lookup_result.block, &key2); if (dm_bio_detain(tc->pool->prison, &key2, bio, &cell2)) { - cell_defer_except(tc, cell); + cell_defer_no_holder(tc, cell); break; } @@ -977,8 +977,8 @@ static void process_discard(struct thin_ } } else { inc_all_io_entry(pool, bio); - cell_defer_except(tc, cell); - cell_defer_except(tc, cell2); + cell_defer_no_holder(tc, cell); + cell_defer_no_holder(tc, cell2); /* * The DM core makes sure that the discard doesn't span @@ -996,13 +996,13 @@ static void process_discard(struct thin_ /* * It isn't provisioned, just forget it. */ - cell_defer_except(tc, cell); + cell_defer_no_holder(tc, cell); bio_endio(bio, 0); break; default: DMERR("discard: find block unexpectedly returned %d", r); - cell_defer_except(tc, cell); + cell_defer_no_holder(tc, cell); bio_io_error(bio); break; } @@ -1057,7 +1057,7 @@ static void process_shared_bio(struct th h->shared_read_entry = dm_deferred_entry_inc(pool->shared_read_ds); inc_all_io_entry(pool, bio); - cell_defer_except(tc, cell); + cell_defer_no_holder(tc, cell); remap_and_issue(tc, bio, lookup_result->block); } @@ -1074,7 +1074,7 @@ static void provision_block(struct thin_ */ if (!bio->bi_size) { inc_all_io_entry(tc->pool, bio); - cell_defer_except(tc, cell); + cell_defer_no_holder(tc, cell); remap_and_issue(tc, bio, 0); return; @@ -1085,7 +1085,7 @@ static void provision_block(struct thin_ */ if (bio_data_dir(bio) == READ) { zero_fill_bio(bio); - cell_defer_except(tc, cell); + cell_defer_no_holder(tc, cell); bio_endio(bio, 0); return; } @@ -1132,10 +1132,10 @@ static void process_bio(struct thin_c *t case 0: if (lookup_result.shared) { process_shared_bio(tc, bio, block, &lookup_result); - cell_defer_except(tc, cell); + cell_defer_no_holder(tc, cell); } else { inc_all_io_entry(tc->pool, bio); - cell_defer_except(tc, cell); + cell_defer_no_holder(tc, cell); remap_and_issue(tc, bio, lookup_result.block); } @@ -1144,7 +1144,7 @@ static void process_bio(struct thin_c *t case -ENODATA: if (bio_data_dir(bio) == READ && tc->origin_dev) { inc_all_io_entry(tc->pool, bio); - cell_defer_except(tc, cell); + cell_defer_no_holder(tc, cell); remap_to_origin_and_issue(tc, bio); } else @@ -1153,7 +1153,7 @@ static void process_bio(struct thin_c *t default: DMERR("dm_thin_find_block() failed, error = %d", r); - cell_defer_except(tc, cell); + cell_defer_no_holder(tc, cell); bio_io_error(bio); break; } @@ -1429,13 +1429,13 @@ static int thin_bio_map(struct dm_target build_data_key(tc->td, result.block, &key); if (dm_bio_detain(tc->pool->prison, &key, bio, &cell2)) { - cell_defer_except(tc, cell1); + cell_defer_no_holder(tc, cell1); return DM_MAPIO_SUBMITTED; } inc_all_io_entry(tc->pool, bio); - cell_defer_except(tc, cell2); - cell_defer_except(tc, cell1); + cell_defer_no_holder(tc, cell2); + cell_defer_no_holder(tc, cell1); remap(tc, bio, result.block); return DM_MAPIO_REMAPPED;