lkml.org 
[lkml]   [2012]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 55/60] dm: remove the second argument of k[un]map_atomic()
    Date
    Acked-by: Milan Broz <mbroz@redhat.com>
    Signed-off-by: Cong Wang <amwang@redhat.com>
    ---
    drivers/md/dm-crypt.c | 8 ++++----
    1 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
    index 8c2a000..db6b516 100644
    --- a/drivers/md/dm-crypt.c
    +++ b/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;
    }

    --
    1.7.7.6


    \
     
     \ /
      Last update: 2012-02-10 06:51    [W:0.070 / U:61.284 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site