Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 452d7a62 authored by Mike Snitzer's avatar Mike Snitzer
Browse files

dm thin: factor out remap_and_issue_overwrite 



Purely cleanup of duplicated code, no functional change.

Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
parent 7a7e97ca

drivers/md/dm-thin.c

+20 −18
Original line number Diff line number Diff line
@@ -890,6 +890,20 @@ static void ll_zero(struct thin_c *tc, struct dm_thin_new_mapping *m, 
	}

}



static void remap_and_issue_overwrite(struct thin_c *tc, struct bio *bio,

				      dm_block_t data_block,

				      struct dm_thin_new_mapping *m)

{

	struct pool *pool = tc->pool;

	struct dm_thin_endio_hook *h = dm_per_bio_data(bio, sizeof(struct dm_thin_endio_hook));



	h->overwrite_mapping = m;

	m->bio = bio;

	save_and_set_endio(bio, &m->saved_bi_end_io, overwrite_endio);

	inc_all_io_entry(pool, bio);

	remap_and_issue(tc, bio, data_block);

}



/*

 * A partial copy also needs to zero the uncopied region.

 */
@@ -924,15 +938,9 @@ static void schedule_copy(struct thin_c *tc, dm_block_t virt_block, 
	 * If the whole block of data is being overwritten, we can issue the

	 * bio immediately. Otherwise we use kcopyd to clone the data first.

	 */

	if (io_overwrites_block(pool, bio)) {

		struct dm_thin_endio_hook *h = dm_per_bio_data(bio, sizeof(struct dm_thin_endio_hook));



		h->overwrite_mapping = m;

		m->bio = bio;

		save_and_set_endio(bio, &m->saved_bi_end_io, overwrite_endio);

		inc_all_io_entry(pool, bio);

		remap_and_issue(tc, bio, data_dest);

	} else {

	if (io_overwrites_block(pool, bio))

		remap_and_issue_overwrite(tc, bio, data_dest, m);

	else {

		struct dm_io_region from, to;



		from.bdev = origin->bdev;
@@ -1001,16 +1009,10 @@ static void schedule_zero(struct thin_c *tc, dm_block_t virt_block, 
	if (!pool->pf.zero_new_blocks)

		process_prepared_mapping(m);



	else if (io_overwrites_block(pool, bio)) {

		struct dm_thin_endio_hook *h = dm_per_bio_data(bio, sizeof(struct dm_thin_endio_hook));



		h->overwrite_mapping = m;

		m->bio = bio;

		save_and_set_endio(bio, &m->saved_bi_end_io, overwrite_endio);

		inc_all_io_entry(pool, bio);

		remap_and_issue(tc, bio, data_block);

	else if (io_overwrites_block(pool, bio))

		remap_and_issue_overwrite(tc, bio, data_block, m);



	} else

	else

		ll_zero(tc, m,

			data_block * pool->sectors_per_block,

			(data_block + 1) * pool->sectors_per_block);