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

Commit 0c395b0f authored by Milan Broz's avatar Milan Broz Committed by Alasdair G Kergon
Browse files

dm crypt: store sector mapping in dm_crypt_io 



Add sector into dm_crypt_io instead of using local variable.

Signed-off-by: default avatarMilan Broz <mbroz@redhat.com>
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
parent 395b167c

drivers/md/dm-crypt.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -52,6 +52,7 @@ struct dm_crypt_io { 




	atomic_t pending;

	atomic_t pending;

	int error;

	int error;

	sector_t sector;

};

};





struct crypt_config;

struct crypt_config;
@@ -526,7 +527,6 @@ static void kcryptd_io_read(struct dm_crypt_io *io) 
	struct crypt_config *cc = io->target->private;

	struct crypt_config *cc = io->target->private;

	struct bio *base_bio = io->base_bio;

	struct bio *base_bio = io->base_bio;

	struct bio *clone;

	struct bio *clone;

	sector_t sector = base_bio->bi_sector - io->target->begin;





	atomic_inc(&io->pending);

	atomic_inc(&io->pending);
@@ -546,7 +546,7 @@ static void kcryptd_io_read(struct dm_crypt_io *io) 
	clone->bi_idx = 0;

	clone->bi_idx = 0;

	clone->bi_vcnt = bio_segments(base_bio);

	clone->bi_vcnt = bio_segments(base_bio);

	clone->bi_size = base_bio->bi_size;

	clone->bi_size = base_bio->bi_size;

	clone->bi_sector = cc->start + sector;

	clone->bi_sector = cc->start + io->sector;

	memcpy(clone->bi_io_vec, bio_iovec(base_bio),

	memcpy(clone->bi_io_vec, bio_iovec(base_bio),

	       sizeof(struct bio_vec) * clone->bi_vcnt);

	       sizeof(struct bio_vec) * clone->bi_vcnt);
@@ -585,11 +585,10 @@ static void kcryptd_crypt_write_convert(struct dm_crypt_io *io) 
	struct bio *base_bio = io->base_bio;

	struct bio *base_bio = io->base_bio;

	struct bio *clone;

	struct bio *clone;

	unsigned remaining = base_bio->bi_size;

	unsigned remaining = base_bio->bi_size;

	sector_t sector = base_bio->bi_sector - io->target->begin;





	atomic_inc(&io->pending);

	atomic_inc(&io->pending);





	crypt_convert_init(cc, &io->ctx, NULL, base_bio, sector);

	crypt_convert_init(cc, &io->ctx, NULL, base_bio, io->sector);





	/*

	/*

	 * The allocated buffers can be smaller than the whole bio,

	 * The allocated buffers can be smaller than the whole bio,
@@ -617,9 +616,9 @@ static void kcryptd_crypt_write_convert(struct dm_crypt_io *io) 
		/* crypt_convert should have filled the clone bio */

		/* crypt_convert should have filled the clone bio */

		BUG_ON(io->ctx.idx_out < clone->bi_vcnt);

		BUG_ON(io->ctx.idx_out < clone->bi_vcnt);





		clone->bi_sector = cc->start + sector;

		clone->bi_sector = cc->start + io->sector;

		remaining -= clone->bi_size;

		remaining -= clone->bi_size;

		sector += bio_sectors(clone);

		io->sector += bio_sectors(clone);





		/* Grab another reference to the io struct

		/* Grab another reference to the io struct

		 * before we kick off the request */

		 * before we kick off the request */
@@ -651,7 +650,7 @@ static void kcryptd_crypt_read_convert(struct dm_crypt_io *io) 
	int r = 0;

	int r = 0;





	crypt_convert_init(cc, &io->ctx, io->base_bio, io->base_bio,

	crypt_convert_init(cc, &io->ctx, io->base_bio, io->base_bio,

			   io->base_bio->bi_sector - io->target->begin);

			   io->sector);





	r = crypt_convert(cc, &io->ctx);

	r = crypt_convert(cc, &io->ctx);
@@ -974,6 +973,7 @@ static int crypt_map(struct dm_target *ti, struct bio *bio, 
	io = mempool_alloc(cc->io_pool, GFP_NOIO);

	io = mempool_alloc(cc->io_pool, GFP_NOIO);

	io->target = ti;

	io->target = ti;

	io->base_bio = bio;

	io->base_bio = bio;

	io->sector = bio->bi_sector - ti->begin;

	io->error = 0;

	io->error = 0;

	atomic_set(&io->pending, 0);

	atomic_set(&io->pending, 0);