aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/target/tcm_fc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-21 12:40:26 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-21 12:40:26 -0400
commit9f3938346a5c1fa504647670edb5fea5756cfb00 (patch)
tree7cf6d24d6b076c8db8571494984924cac03703a2 /drivers/target/tcm_fc
parent69a7aebcf019ab3ff5764525ad6858fbe23bb86d (diff)
parent317b6e128247f75976b0fc2b9fd8d2c20ef13b3a (diff)
Merge branch 'kmap_atomic' of git://github.com/congwang/linux
Pull kmap_atomic cleanup from Cong Wang. It's been in -next for a long time, and it gets rid of the (no longer used) second argument to k[un]map_atomic(). Fix up a few trivial conflicts in various drivers, and do an "evil merge" to catch some new uses that have come in since Cong's tree. * 'kmap_atomic' of git://github.com/congwang/linux: (59 commits) feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal highmem: kill all __kmap_atomic() [swarren@nvidia.com: highmem: Fix ARM build break due to __kmap_atomic rename] drbd: remove the second argument of k[un]map_atomic() zcache: remove the second argument of k[un]map_atomic() gma500: remove the second argument of k[un]map_atomic() dm: remove the second argument of k[un]map_atomic() tomoyo: remove the second argument of k[un]map_atomic() sunrpc: remove the second argument of k[un]map_atomic() rds: remove the second argument of k[un]map_atomic() net: remove the second argument of k[un]map_atomic() mm: remove the second argument of k[un]map_atomic() lib: remove the second argument of k[un]map_atomic() power: remove the second argument of k[un]map_atomic() kdb: remove the second argument of k[un]map_atomic() udf: remove the second argument of k[un]map_atomic() ubifs: remove the second argument of k[un]map_atomic() squashfs: remove the second argument of k[un]map_atomic() reiserfs: remove the second argument of k[un]map_atomic() ocfs2: remove the second argument of k[un]map_atomic() ntfs: remove the second argument of k[un]map_atomic() ...
Diffstat (limited to 'drivers/target/tcm_fc')
-rw-r--r--drivers/target/tcm_fc/tfc_io.c10
1 files changed, 4 insertions, 6 deletions
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;