From ca28f230c01651c841db2a4ef9a89b95c14a0328 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Tue, 21 Oct 2008 17:45:00 +0100 Subject: [PATCH] --- yaml --- r: 117015 b: refs/heads/master c: b635b00e0e159d858486fd899c4021d1d67757e2 h: refs/heads/master i: 117013: 1ce1ef6b47278c63a9ba4ab587c54151028c10b8 117011: 04752133947f5f94557ad60e88bba153022666ea 117007: 48be5a4cf6a65336a2890bd4a0bc4fdb13cc5103 v: v3 --- [refs] | 2 +- trunk/drivers/md/dm-crypt.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 620438a6cb76..f24af4b604aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 586e80e6ee0d137c7d79fbae183bb37bc60ee97e +refs/heads/master: b635b00e0e159d858486fd899c4021d1d67757e2 diff --git a/trunk/drivers/md/dm-crypt.c b/trunk/drivers/md/dm-crypt.c index 8939cba6e748..ad98ded3008c 100644 --- a/trunk/drivers/md/dm-crypt.c +++ b/trunk/drivers/md/dm-crypt.c @@ -688,7 +688,6 @@ static void kcryptd_crypt_write_io_submit(struct dm_crypt_io *io, BUG_ON(io->ctx.idx_out < clone->bi_vcnt); clone->bi_sector = cc->start + io->sector; - io->sector += bio_sectors(clone); if (async) kcryptd_queue_io(io); @@ -703,13 +702,14 @@ static void kcryptd_crypt_write_convert(struct dm_crypt_io *io) int crypt_finished; unsigned out_of_pages = 0; unsigned remaining = io->base_bio->bi_size; + sector_t sector = io->sector; int r; /* * Prevent io from disappearing until this function completes. */ crypt_inc_pending(io); - crypt_convert_init(cc, &io->ctx, NULL, io->base_bio, io->sector); + crypt_convert_init(cc, &io->ctx, NULL, io->base_bio, sector); /* * The allocated buffers can be smaller than the whole bio, @@ -726,6 +726,7 @@ static void kcryptd_crypt_write_convert(struct dm_crypt_io *io) io->ctx.idx_out = 0; remaining -= clone->bi_size; + sector += bio_sectors(clone); crypt_inc_pending(io); r = crypt_convert(cc, &io->ctx); @@ -741,6 +742,8 @@ static void kcryptd_crypt_write_convert(struct dm_crypt_io *io) */ if (unlikely(r < 0)) break; + + io->sector = sector; } /*