diff options
author | Cong Wang <amwang@redhat.com> | 2011-11-25 10:14:25 -0500 |
---|---|---|
committer | Cong Wang <xiyou.wangcong@gmail.com> | 2012-03-20 09:48:20 -0400 |
commit | ca747d610b765f184e0662088dd9aeecf9a17822 (patch) | |
tree | ced29c47417e2ef78d1fb1fc11dfd79a4b96c272 | |
parent | ba82fe2e691146a92a25c85b611b436dc20f7825 (diff) |
target: remove the second argument of k[un]map_atomic()
Signed-off-by: Cong Wang <amwang@redhat.com>
-rw-r--r-- | drivers/target/target_core_transport.c | 4 | ||||
-rw-r--r-- | 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 cd5cd95812bb..929cc9364c8a 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) | |||
2344 | 2344 | ||
2345 | offset = 0; | 2345 | offset = 0; |
2346 | for_each_sg(cmd->t_bidi_data_sg, sg, cmd->t_bidi_data_nents, count) { | 2346 | for_each_sg(cmd->t_bidi_data_sg, sg, cmd->t_bidi_data_nents, count) { |
2347 | addr = kmap_atomic(sg_page(sg), KM_USER0); | 2347 | addr = kmap_atomic(sg_page(sg)); |
2348 | if (!addr) | 2348 | if (!addr) |
2349 | goto out; | 2349 | goto out; |
2350 | 2350 | ||
@@ -2352,7 +2352,7 @@ static void transport_xor_callback(struct se_cmd *cmd) | |||
2352 | *(addr + sg->offset + i) ^= *(buf + offset + i); | 2352 | *(addr + sg->offset + i) ^= *(buf + offset + i); |
2353 | 2353 | ||
2354 | offset += sg->length; | 2354 | offset += sg->length; |
2355 | kunmap_atomic(addr, KM_USER0); | 2355 | kunmap_atomic(addr); |
2356 | } | 2356 | } |
2357 | 2357 | ||
2358 | out: | 2358 | out: |
diff --git a/drivers/target/tcm_fc/tfc_io.c b/drivers/target/tcm_fc/tfc_io.c index d8cabc21036d..2b693eefac55 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) | |||
146 | PAGE_SIZE << compound_order(page); | 146 | PAGE_SIZE << compound_order(page); |
147 | } else { | 147 | } else { |
148 | BUG_ON(!page); | 148 | BUG_ON(!page); |
149 | from = kmap_atomic(page + (mem_off >> PAGE_SHIFT), | 149 | from = kmap_atomic(page + (mem_off >> PAGE_SHIFT)); |
150 | KM_SOFTIRQ0); | ||
151 | page_addr = from; | 150 | page_addr = from; |
152 | from += mem_off & ~PAGE_MASK; | 151 | from += mem_off & ~PAGE_MASK; |
153 | tlen = min(tlen, (size_t)(PAGE_SIZE - | 152 | tlen = min(tlen, (size_t)(PAGE_SIZE - |
154 | (mem_off & ~PAGE_MASK))); | 153 | (mem_off & ~PAGE_MASK))); |
155 | memcpy(to, from, tlen); | 154 | memcpy(to, from, tlen); |
156 | kunmap_atomic(page_addr, KM_SOFTIRQ0); | 155 | kunmap_atomic(page_addr); |
157 | to += tlen; | 156 | to += tlen; |
158 | } | 157 | } |
159 | 158 | ||
@@ -291,14 +290,13 @@ void ft_recv_write_data(struct ft_cmd *cmd, struct fc_frame *fp) | |||
291 | 290 | ||
292 | tlen = min(mem_len, frame_len); | 291 | tlen = min(mem_len, frame_len); |
293 | 292 | ||
294 | to = kmap_atomic(page + (mem_off >> PAGE_SHIFT), | 293 | to = kmap_atomic(page + (mem_off >> PAGE_SHIFT)); |
295 | KM_SOFTIRQ0); | ||
296 | page_addr = to; | 294 | page_addr = to; |
297 | to += mem_off & ~PAGE_MASK; | 295 | to += mem_off & ~PAGE_MASK; |
298 | tlen = min(tlen, (size_t)(PAGE_SIZE - | 296 | tlen = min(tlen, (size_t)(PAGE_SIZE - |
299 | (mem_off & ~PAGE_MASK))); | 297 | (mem_off & ~PAGE_MASK))); |
300 | memcpy(to, from, tlen); | 298 | memcpy(to, from, tlen); |
301 | kunmap_atomic(page_addr, KM_SOFTIRQ0); | 299 | kunmap_atomic(page_addr); |
302 | 300 | ||
303 | from += tlen; | 301 | from += tlen; |
304 | frame_len -= tlen; | 302 | frame_len -= tlen; |