tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Signed-off-by: Cong Wang <amwang@redhat.com>

authored by

Cong Wang and committed by
Cong Wang b8541786 6114eab5

+18 -18
+2 -2
net/sunrpc/auth_gss/gss_krb5_wrap.c
··· 82 82 >>PAGE_CACHE_SHIFT; 83 83 unsigned int offset = (buf->page_base + len - 1) 84 84 & (PAGE_CACHE_SIZE - 1); 85 - ptr = kmap_atomic(buf->pages[last], KM_USER0); 85 + ptr = kmap_atomic(buf->pages[last]); 86 86 pad = *(ptr + offset); 87 - kunmap_atomic(ptr, KM_USER0); 87 + kunmap_atomic(ptr); 88 88 goto out; 89 89 } else 90 90 len -= buf->page_len;
+2 -2
net/sunrpc/socklib.c
··· 114 114 } 115 115 116 116 len = PAGE_CACHE_SIZE; 117 - kaddr = kmap_atomic(*ppage, KM_SKB_SUNRPC_DATA); 117 + kaddr = kmap_atomic(*ppage); 118 118 if (base) { 119 119 len -= base; 120 120 if (pglen < len) ··· 127 127 ret = copy_actor(desc, kaddr, len); 128 128 } 129 129 flush_dcache_page(*ppage); 130 - kunmap_atomic(kaddr, KM_SKB_SUNRPC_DATA); 130 + kunmap_atomic(kaddr); 131 131 copied += ret; 132 132 if (ret != len || !desc->count) 133 133 goto out;
+10 -10
net/sunrpc/xdr.c
··· 122 122 { 123 123 char *kaddr; 124 124 125 - kaddr = kmap_atomic(buf->pages[0], KM_USER0); 125 + kaddr = kmap_atomic(buf->pages[0]); 126 126 kaddr[buf->page_base + len] = '\0'; 127 - kunmap_atomic(kaddr, KM_USER0); 127 + kunmap_atomic(kaddr); 128 128 } 129 129 EXPORT_SYMBOL_GPL(xdr_terminate_string); 130 130 ··· 232 232 pgto_base -= copy; 233 233 pgfrom_base -= copy; 234 234 235 - vto = kmap_atomic(*pgto, KM_USER0); 236 - vfrom = kmap_atomic(*pgfrom, KM_USER1); 235 + vto = kmap_atomic(*pgto); 236 + vfrom = kmap_atomic(*pgfrom); 237 237 memmove(vto + pgto_base, vfrom + pgfrom_base, copy); 238 238 flush_dcache_page(*pgto); 239 - kunmap_atomic(vfrom, KM_USER1); 240 - kunmap_atomic(vto, KM_USER0); 239 + kunmap_atomic(vfrom); 240 + kunmap_atomic(vto); 241 241 242 242 } while ((len -= copy) != 0); 243 243 } ··· 267 267 if (copy > len) 268 268 copy = len; 269 269 270 - vto = kmap_atomic(*pgto, KM_USER0); 270 + vto = kmap_atomic(*pgto); 271 271 memcpy(vto + pgbase, p, copy); 272 - kunmap_atomic(vto, KM_USER0); 272 + kunmap_atomic(vto); 273 273 274 274 len -= copy; 275 275 if (len == 0) ··· 311 311 if (copy > len) 312 312 copy = len; 313 313 314 - vfrom = kmap_atomic(*pgfrom, KM_USER0); 314 + vfrom = kmap_atomic(*pgfrom); 315 315 memcpy(p, vfrom + pgbase, copy); 316 - kunmap_atomic(vfrom, KM_USER0); 316 + kunmap_atomic(vfrom); 317 317 318 318 pgbase += copy; 319 319 if (pgbase == PAGE_CACHE_SIZE) {
+4 -4
net/sunrpc/xprtrdma/rpc_rdma.c
··· 338 338 curlen = copy_len; 339 339 dprintk("RPC: %s: page %d destp 0x%p len %d curlen %d\n", 340 340 __func__, i, destp, copy_len, curlen); 341 - srcp = kmap_atomic(ppages[i], KM_SKB_SUNRPC_DATA); 341 + srcp = kmap_atomic(ppages[i]); 342 342 memcpy(destp, srcp+page_base, curlen); 343 - kunmap_atomic(srcp, KM_SKB_SUNRPC_DATA); 343 + kunmap_atomic(srcp); 344 344 rqst->rq_svec[0].iov_len += curlen; 345 345 destp += curlen; 346 346 copy_len -= curlen; ··· 639 639 dprintk("RPC: %s: page %d" 640 640 " srcp 0x%p len %d curlen %d\n", 641 641 __func__, i, srcp, copy_len, curlen); 642 - destp = kmap_atomic(ppages[i], KM_SKB_SUNRPC_DATA); 642 + destp = kmap_atomic(ppages[i]); 643 643 memcpy(destp + page_base, srcp, curlen); 644 644 flush_dcache_page(ppages[i]); 645 - kunmap_atomic(destp, KM_SKB_SUNRPC_DATA); 645 + kunmap_atomic(destp); 646 646 srcp += curlen; 647 647 copy_len -= curlen; 648 648 if (copy_len == 0)