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 25/60] target: remove the second argument of k[un]map_atomic()
    Date
    Signed-off-by: Cong Wang <amwang@redhat.com>
    ---
    drivers/target/target_core_transport.c | 4 ++--
    drivers/target/tcm_fc/tfc_io.c | 10 ++++------
    2 files changed, 6 insertions(+), 8 deletions(-)

    diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
    index 58cea07..58c12d7 100644
    --- a/drivers/target/target_core_transport.c
    +++ b/drivers/target/target_core_transport.c
    @@ -2344,7 +2344,7 @@ static void transport_xor_callback(struct se_cmd *cmd)

    offset = 0;
    for_each_sg(cmd->t_bidi_data_sg, sg, cmd->t_bidi_data_nents, count) {
    - addr = kmap_atomic(sg_page(sg), KM_USER0);
    + addr = kmap_atomic(sg_page(sg));
    if (!addr)
    goto out;

    @@ -2352,7 +2352,7 @@ static void transport_xor_callback(struct se_cmd *cmd)
    *(addr + sg->offset + i) ^= *(buf + offset + i);

    offset += sg->length;
    - kunmap_atomic(addr, KM_USER0);
    + kunmap_atomic(addr);
    }

    out:
    diff --git a/drivers/target/tcm_fc/tfc_io.c b/drivers/target/tcm_fc/tfc_io.c
    index d8cabc2..2b693ee 100644
    --- a/drivers/target/tcm_fc/tfc_io.c
    +++ b/drivers/target/tcm_fc/tfc_io.c
    @@ -146,14 +146,13 @@ int ft_queue_data_in(struct se_cmd *se_cmd)
    PAGE_SIZE << compound_order(page);
    } else {
    BUG_ON(!page);
    - from = kmap_atomic(page + (mem_off >> PAGE_SHIFT),
    - KM_SOFTIRQ0);
    + from = kmap_atomic(page + (mem_off >> PAGE_SHIFT));
    page_addr = from;
    from += mem_off & ~PAGE_MASK;
    tlen = min(tlen, (size_t)(PAGE_SIZE -
    (mem_off & ~PAGE_MASK)));
    memcpy(to, from, tlen);
    - kunmap_atomic(page_addr, KM_SOFTIRQ0);
    + kunmap_atomic(page_addr);
    to += tlen;
    }

    @@ -291,14 +290,13 @@ void ft_recv_write_data(struct ft_cmd *cmd, struct fc_frame *fp)

    tlen = min(mem_len, frame_len);

    - to = kmap_atomic(page + (mem_off >> PAGE_SHIFT),
    - KM_SOFTIRQ0);
    + to = kmap_atomic(page + (mem_off >> PAGE_SHIFT));
    page_addr = to;
    to += mem_off & ~PAGE_MASK;
    tlen = min(tlen, (size_t)(PAGE_SIZE -
    (mem_off & ~PAGE_MASK)));
    memcpy(to, from, tlen);
    - kunmap_atomic(page_addr, KM_SOFTIRQ0);
    + kunmap_atomic(page_addr);

    from += tlen;
    frame_len -= tlen;
    --
    1.7.7.6


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