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

squashfs: 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
53b55e55 883da600

+6 -6
+4 -4
fs/squashfs/file.c
··· 464 464 if (PageUptodate(push_page)) 465 465 goto skip_page; 466 466 467 - pageaddr = kmap_atomic(push_page, KM_USER0); 467 + pageaddr = kmap_atomic(push_page); 468 468 squashfs_copy_data(pageaddr, buffer, offset, avail); 469 469 memset(pageaddr + avail, 0, PAGE_CACHE_SIZE - avail); 470 - kunmap_atomic(pageaddr, KM_USER0); 470 + kunmap_atomic(pageaddr); 471 471 flush_dcache_page(push_page); 472 472 SetPageUptodate(push_page); 473 473 skip_page: ··· 484 484 error_out: 485 485 SetPageError(page); 486 486 out: 487 - pageaddr = kmap_atomic(page, KM_USER0); 487 + pageaddr = kmap_atomic(page); 488 488 memset(pageaddr, 0, PAGE_CACHE_SIZE); 489 - kunmap_atomic(pageaddr, KM_USER0); 489 + kunmap_atomic(pageaddr); 490 490 flush_dcache_page(page); 491 491 if (!PageError(page)) 492 492 SetPageUptodate(page);
+2 -2
fs/squashfs/symlink.c
··· 90 90 goto error_out; 91 91 } 92 92 93 - pageaddr = kmap_atomic(page, KM_USER0); 93 + pageaddr = kmap_atomic(page); 94 94 copied = squashfs_copy_data(pageaddr + bytes, entry, offset, 95 95 length - bytes); 96 96 if (copied == length - bytes) 97 97 memset(pageaddr + length, 0, PAGE_CACHE_SIZE - length); 98 98 else 99 99 block = entry->next_index; 100 - kunmap_atomic(pageaddr, KM_USER0); 100 + kunmap_atomic(pageaddr); 101 101 squashfs_cache_put(entry); 102 102 } 103 103