From 5a5ef9fc09930a2441ecf212fa5305521cfdbb54 Mon Sep 17 00:00:00 2001 From: Cong Wang Date: Mon, 28 Nov 2011 13:26:02 +0800 Subject: [PATCH] --- yaml --- r: 291831 b: refs/heads/master c: c2e022cb654fa6595238dc52311a85e6444da1f7 h: refs/heads/master i: 291829: f87af279fe2ac56c7f1a36febb60e487f19d3f66 291827: 624b7ff58add2e06a88827925034540a3afe11c5 291823: dc7f5aee8ff5d7e4025c5252f298b2c2957f4d7c v: v3 --- [refs] | 2 +- trunk/drivers/md/dm-crypt.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index fea6514547da..375124995f83 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c58e0377d61e209600def7d4d9ae535ea94bc210 +refs/heads/master: c2e022cb654fa6595238dc52311a85e6444da1f7 diff --git a/trunk/drivers/md/dm-crypt.c b/trunk/drivers/md/dm-crypt.c index 8c2a000cf3f5..db6b51639cee 100644 --- a/trunk/drivers/md/dm-crypt.c +++ b/trunk/drivers/md/dm-crypt.c @@ -590,9 +590,9 @@ static int crypt_iv_lmk_gen(struct crypt_config *cc, u8 *iv, int r = 0; if (bio_data_dir(dmreq->ctx->bio_in) == WRITE) { - src = kmap_atomic(sg_page(&dmreq->sg_in), KM_USER0); + src = kmap_atomic(sg_page(&dmreq->sg_in)); r = crypt_iv_lmk_one(cc, iv, dmreq, src + dmreq->sg_in.offset); - kunmap_atomic(src, KM_USER0); + kunmap_atomic(src); } else memset(iv, 0, cc->iv_size); @@ -608,14 +608,14 @@ static int crypt_iv_lmk_post(struct crypt_config *cc, u8 *iv, if (bio_data_dir(dmreq->ctx->bio_in) == WRITE) return 0; - dst = kmap_atomic(sg_page(&dmreq->sg_out), KM_USER0); + dst = kmap_atomic(sg_page(&dmreq->sg_out)); r = crypt_iv_lmk_one(cc, iv, dmreq, dst + dmreq->sg_out.offset); /* Tweak the first block of plaintext sector */ if (!r) crypto_xor(dst + dmreq->sg_out.offset, iv, cc->iv_size); - kunmap_atomic(dst, KM_USER0); + kunmap_atomic(dst); return r; }