Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

[cascardo/linux.git] / fs / fuse / file.c

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 8ca007d..504e61b 100644 (file)
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1930,11 +1930,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;