diff options
author | Cong Wang <amwang@redhat.com> | 2011-11-25 10:14:30 -0500 |
---|---|---|
committer | Cong Wang <xiyou.wangcong@gmail.com> | 2012-03-20 09:48:22 -0400 |
commit | 2408f6ef6bf58620f8330b37181d2bdca2e7c7c5 (patch) | |
tree | 80093a2bd67a78f17de1cc8bdad2e6bc6e3b50c0 /fs | |
parent | d4a23aee23710dabeaa44c30950b87d33bf104be (diff) |
fuse: remove the second argument of k[un]map_atomic()
Signed-off-by: Cong Wang <amwang@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/fuse/dev.c | 4 | ||||
-rw-r--r-- | fs/fuse/file.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index 5f3368ab0fa9..7df2b5e8fbe1 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c | |||
@@ -838,10 +838,10 @@ static int fuse_copy_page(struct fuse_copy_state *cs, struct page **pagep, | |||
838 | } | 838 | } |
839 | } | 839 | } |
840 | if (page) { | 840 | if (page) { |
841 | void *mapaddr = kmap_atomic(page, KM_USER0); | 841 | void *mapaddr = kmap_atomic(page); |
842 | void *buf = mapaddr + offset; | 842 | void *buf = mapaddr + offset; |
843 | offset += fuse_copy_do(cs, &buf, &count); | 843 | offset += fuse_copy_do(cs, &buf, &count); |
844 | kunmap_atomic(mapaddr, KM_USER0); | 844 | kunmap_atomic(mapaddr); |
845 | } else | 845 | } else |
846 | offset += fuse_copy_do(cs, NULL, &count); | 846 | offset += fuse_copy_do(cs, NULL, &count); |
847 | } | 847 | } |
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 4a199fd93fbd..a841868bf9ce 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c | |||
@@ -1887,11 +1887,11 @@ long fuse_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg, | |||
1887 | in_iovs + out_iovs > FUSE_IOCTL_MAX_IOV) | 1887 | in_iovs + out_iovs > FUSE_IOCTL_MAX_IOV) |
1888 | goto out; | 1888 | goto out; |
1889 | 1889 | ||
1890 | vaddr = kmap_atomic(pages[0], KM_USER0); | 1890 | vaddr = kmap_atomic(pages[0]); |
1891 | err = fuse_copy_ioctl_iovec(fc, iov_page, vaddr, | 1891 | err = fuse_copy_ioctl_iovec(fc, iov_page, vaddr, |
1892 | transferred, in_iovs + out_iovs, | 1892 | transferred, in_iovs + out_iovs, |
1893 | (flags & FUSE_IOCTL_COMPAT) != 0); | 1893 | (flags & FUSE_IOCTL_COMPAT) != 0); |
1894 | kunmap_atomic(vaddr, KM_USER0); | 1894 | kunmap_atomic(vaddr); |
1895 | if (err) | 1895 | if (err) |
1896 | goto out; | 1896 | goto out; |
1897 | 1897 | ||