dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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

Signed-off-by: Cong Wang <amwang@redhat.com>
This commit is contained in:
Cong Wang 2011-11-25 23:14:25 +08:00 committed by Cong Wang
parent ba82fe2e69
commit ca747d610b
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/target/target_core_transport.c
View File

@ -2344,7 +2344,7 @@ static void transport_xor_callback(struct se_cmd *cmd)
offset = 0; offset = 0;
for_each_sg(cmd->t_bidi_data_sg, sg, cmd->t_bidi_data_nents, count) { 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) if (!addr)
goto out; goto out;
@ -2352,7 +2352,7 @@ static void transport_xor_callback(struct se_cmd *cmd)
*(addr + sg->offset + i) ^= *(buf + offset + i); *(addr + sg->offset + i) ^= *(buf + offset + i);
offset += sg->length; offset += sg->length;
kunmap_atomic(addr, KM_USER0); kunmap_atomic(addr);
} }
out: out:

10
drivers/target/tcm_fc/tfc_io.c
View File

@ -146,14 +146,13 @@ int ft_queue_data_in(struct se_cmd *se_cmd)
PAGE_SIZE << compound_order(page); PAGE_SIZE << compound_order(page);
} else { } else {
BUG_ON(!page); BUG_ON(!page);
from = kmap_atomic(page + (mem_off >> PAGE_SHIFT), from = kmap_atomic(page + (mem_off >> PAGE_SHIFT));
KM_SOFTIRQ0);
page_addr = from; page_addr = from;
from += mem_off & ~PAGE_MASK; from += mem_off & ~PAGE_MASK;
tlen = min(tlen, (size_t)(PAGE_SIZE - tlen = min(tlen, (size_t)(PAGE_SIZE -
(mem_off & ~PAGE_MASK))); (mem_off & ~PAGE_MASK)));
memcpy(to, from, tlen); memcpy(to, from, tlen);
kunmap_atomic(page_addr, KM_SOFTIRQ0); kunmap_atomic(page_addr);
to += tlen; 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); tlen = min(mem_len, frame_len);
to = kmap_atomic(page + (mem_off >> PAGE_SHIFT), to = kmap_atomic(page + (mem_off >> PAGE_SHIFT));
KM_SOFTIRQ0);
page_addr = to; page_addr = to;
to += mem_off & ~PAGE_MASK; to += mem_off & ~PAGE_MASK;
tlen = min(tlen, (size_t)(PAGE_SIZE - tlen = min(tlen, (size_t)(PAGE_SIZE -
(mem_off & ~PAGE_MASK))); (mem_off & ~PAGE_MASK)));
memcpy(to, from, tlen); memcpy(to, from, tlen);
kunmap_atomic(page_addr, KM_SOFTIRQ0); kunmap_atomic(page_addr);
from += tlen; from += tlen;
frame_len -= tlen; frame_len -= tlen;