Skip to content

Commit

Permalink
target: remove the second argument of k[un]map_atomic()
Browse files Browse the repository at this point in the history
Signed-off-by: Cong Wang <amwang@redhat.com>
  • Loading branch information
Cong Wang authored and Cong Wang committed Mar 20, 2012
1 parent ba82fe2 commit ca747d6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions drivers/target/target_core_transport.c
Original file line number Diff line number Diff line change
Expand Up @@ -2344,15 +2344,15 @@ 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;

for (i = 0; i < sg->length; i++)
*(addr + sg->offset + i) ^= *(buf + offset + i);

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

out:
Expand Down
10 changes: 4 additions & 6 deletions drivers/target/tcm_fc/tfc_io.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit ca747d6

Please sign in to comment.