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

fuse: 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
2408f6ef d4a23aee

+4 -4
+2 -2
fs/fuse/dev.c
··· 838 838 } 839 839 } 840 840 if (page) { 841 - void *mapaddr = kmap_atomic(page, KM_USER0); 841 + void *mapaddr = kmap_atomic(page); 842 842 void *buf = mapaddr + offset; 843 843 offset += fuse_copy_do(cs, &buf, &count); 844 - kunmap_atomic(mapaddr, KM_USER0); 844 + kunmap_atomic(mapaddr); 845 845 } else 846 846 offset += fuse_copy_do(cs, NULL, &count); 847 847 }
+2 -2
fs/fuse/file.c
··· 1887 1887 in_iovs + out_iovs > FUSE_IOCTL_MAX_IOV) 1888 1888 goto out; 1889 1889 1890 - vaddr = kmap_atomic(pages[0], KM_USER0); 1890 + vaddr = kmap_atomic(pages[0]); 1891 1891 err = fuse_copy_ioctl_iovec(fc, iov_page, vaddr, 1892 1892 transferred, in_iovs + out_iovs, 1893 1893 (flags & FUSE_IOCTL_COMPAT) != 0); 1894 - kunmap_atomic(vaddr, KM_USER0); 1894 + kunmap_atomic(vaddr); 1895 1895 if (err) 1896 1896 goto out; 1897 1897