]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
fuse: remove the second argument of k[un]map_atomic()
authorCong Wang <amwang@redhat.com>
Fri, 25 Nov 2011 15:14:30 +0000 (23:14 +0800)
committerCong Wang <xiyou.wangcong@gmail.com>
Tue, 20 Mar 2012 13:48:22 +0000 (21:48 +0800)
Signed-off-by: Cong Wang <amwang@redhat.com>
fs/fuse/dev.c
fs/fuse/file.c

index 5f3368ab0fa9d44ff8b5121db33d158ef5989da9..7df2b5e8fbe187af6599504f935d1ed463a40c64 100644 (file)
@@ -838,10 +838,10 @@ static int fuse_copy_page(struct fuse_copy_state *cs, struct page **pagep,
                        }
                }
                if (page) {
-                       void *mapaddr = kmap_atomic(page, KM_USER0);
+                       void *mapaddr = kmap_atomic(page);
                        void *buf = mapaddr + offset;
                        offset += fuse_copy_do(cs, &buf, &count);
-                       kunmap_atomic(mapaddr, KM_USER0);
+                       kunmap_atomic(mapaddr);
                } else
                        offset += fuse_copy_do(cs, NULL, &count);
        }
index 4a199fd93fbddaace1a65f74bc3872bfcbb76cc5..a841868bf9ce363cb9705f3a5ba978a39c682df7 100644 (file)
@@ -1887,11 +1887,11 @@ long fuse_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg,
                    in_iovs + out_iovs > FUSE_IOCTL_MAX_IOV)
                        goto out;
 
-               vaddr = kmap_atomic(pages[0], KM_USER0);
+               vaddr = kmap_atomic(pages[0]);
                err = fuse_copy_ioctl_iovec(fc, iov_page, vaddr,
                                            transferred, in_iovs + out_iovs,
                                            (flags & FUSE_IOCTL_COMPAT) != 0);
-               kunmap_atomic(vaddr, KM_USER0);
+               kunmap_atomic(vaddr);
                if (err)
                        goto out;