diff options
author | Cong Wang <amwang@redhat.com> | 2011-11-25 10:14:40 -0500 |
---|---|---|
committer | Cong Wang <xiyou.wangcong@gmail.com> | 2012-03-20 09:48:28 -0400 |
commit | b85417860172ff693dc115d7999805fc240cec1c (patch) | |
tree | e7f1c8ac18958e7bcb9182caa8639104384e44f9 /net/sunrpc/xdr.c | |
parent | 6114eab535ab49239e0a6ce08eb9243664aef993 (diff) |
sunrpc: remove the second argument of k[un]map_atomic()
Signed-off-by: Cong Wang <amwang@redhat.com>
Diffstat (limited to 'net/sunrpc/xdr.c')
-rw-r--r-- | net/sunrpc/xdr.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c index 593f4c605305..b97a3dd9a60a 100644 --- a/net/sunrpc/xdr.c +++ b/net/sunrpc/xdr.c | |||
@@ -122,9 +122,9 @@ xdr_terminate_string(struct xdr_buf *buf, const u32 len) | |||
122 | { | 122 | { |
123 | char *kaddr; | 123 | char *kaddr; |
124 | 124 | ||
125 | kaddr = kmap_atomic(buf->pages[0], KM_USER0); | 125 | kaddr = kmap_atomic(buf->pages[0]); |
126 | kaddr[buf->page_base + len] = '\0'; | 126 | kaddr[buf->page_base + len] = '\0'; |
127 | kunmap_atomic(kaddr, KM_USER0); | 127 | kunmap_atomic(kaddr); |
128 | } | 128 | } |
129 | EXPORT_SYMBOL_GPL(xdr_terminate_string); | 129 | EXPORT_SYMBOL_GPL(xdr_terminate_string); |
130 | 130 | ||
@@ -232,12 +232,12 @@ _shift_data_right_pages(struct page **pages, size_t pgto_base, | |||
232 | pgto_base -= copy; | 232 | pgto_base -= copy; |
233 | pgfrom_base -= copy; | 233 | pgfrom_base -= copy; |
234 | 234 | ||
235 | vto = kmap_atomic(*pgto, KM_USER0); | 235 | vto = kmap_atomic(*pgto); |
236 | vfrom = kmap_atomic(*pgfrom, KM_USER1); | 236 | vfrom = kmap_atomic(*pgfrom); |
237 | memmove(vto + pgto_base, vfrom + pgfrom_base, copy); | 237 | memmove(vto + pgto_base, vfrom + pgfrom_base, copy); |
238 | flush_dcache_page(*pgto); | 238 | flush_dcache_page(*pgto); |
239 | kunmap_atomic(vfrom, KM_USER1); | 239 | kunmap_atomic(vfrom); |
240 | kunmap_atomic(vto, KM_USER0); | 240 | kunmap_atomic(vto); |
241 | 241 | ||
242 | } while ((len -= copy) != 0); | 242 | } while ((len -= copy) != 0); |
243 | } | 243 | } |
@@ -267,9 +267,9 @@ _copy_to_pages(struct page **pages, size_t pgbase, const char *p, size_t len) | |||
267 | if (copy > len) | 267 | if (copy > len) |
268 | copy = len; | 268 | copy = len; |
269 | 269 | ||
270 | vto = kmap_atomic(*pgto, KM_USER0); | 270 | vto = kmap_atomic(*pgto); |
271 | memcpy(vto + pgbase, p, copy); | 271 | memcpy(vto + pgbase, p, copy); |
272 | kunmap_atomic(vto, KM_USER0); | 272 | kunmap_atomic(vto); |
273 | 273 | ||
274 | len -= copy; | 274 | len -= copy; |
275 | if (len == 0) | 275 | if (len == 0) |
@@ -311,9 +311,9 @@ _copy_from_pages(char *p, struct page **pages, size_t pgbase, size_t len) | |||
311 | if (copy > len) | 311 | if (copy > len) |
312 | copy = len; | 312 | copy = len; |
313 | 313 | ||
314 | vfrom = kmap_atomic(*pgfrom, KM_USER0); | 314 | vfrom = kmap_atomic(*pgfrom); |
315 | memcpy(p, vfrom + pgbase, copy); | 315 | memcpy(p, vfrom + pgbase, copy); |
316 | kunmap_atomic(vfrom, KM_USER0); | 316 | kunmap_atomic(vfrom); |
317 | 317 | ||
318 | pgbase += copy; | 318 | pgbase += copy; |
319 | if (pgbase == PAGE_CACHE_SIZE) { | 319 | if (pgbase == PAGE_CACHE_SIZE) { |