lkml.org 
[lkml]   [2012]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 33/60] fuse: remove the second argument of k[un]map_atomic()
    Date
    Signed-off-by: Cong Wang <amwang@redhat.com>
    ---
    fs/fuse/dev.c | 4 ++--
    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 5f3368a..7df2b5e 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,
    }
    }
    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);
    }
    diff --git a/fs/fuse/file.c b/fs/fuse/file.c
    index 4a199fd..a841868 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,
    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;

    --
    1.7.7.6


    \
     
     \ /
      Last update: 2012-02-10 06:55    [W:0.043 / U:119.808 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site