evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dm: remove the second argument of k[un]map_atomic()

Browse source 
Acked-by: Milan Broz <mbroz@redhat.com>
Signed-off-by: Cong Wang <amwang@redhat.com>
This commit is contained in:
Cong Wang 2011-11-28 13:26:02 +08:00 • committed by Cong Wang
parent c58e0377d6
commit c2e022cb65
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/md/dm-crypt.c
View file

@ -590,9 +590,9 @@ static int crypt_iv_lmk_gen(struct crypt_config *cc, u8 *iv,
int r = 0; int r = 0;
if (bio_data_dir(dmreq->ctx->bio_in) == WRITE) { 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); r = crypt_iv_lmk_one(cc, iv, dmreq, src + dmreq->sg_in.offset);
kunmap_atomic(src, KM_USER0); kunmap_atomic(src);
} else } else
memset(iv, 0, cc->iv_size); 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) if (bio_data_dir(dmreq->ctx->bio_in) == WRITE)
return 0; 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); r = crypt_iv_lmk_one(cc, iv, dmreq, dst + dmreq->sg_out.offset);
/* Tweak the first block of plaintext sector */ /* Tweak the first block of plaintext sector */
if (!r) if (!r)
crypto_xor(dst + dmreq->sg_out.offset, iv, cc->iv_size); crypto_xor(dst + dmreq->sg_out.offset, iv, cc->iv_size);
kunmap_atomic(dst, KM_USER0); kunmap_atomic(dst);
return r; return r;
} }