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 39/60] nfs: remove the second argument of k[un]map_atomic()
    Date
    Signed-off-by: Cong Wang <amwang@redhat.com>
    ---
    fs/nfs/dir.c | 8 ++++----
    fs/nfs/nfs4proc.c | 4 ++--
    2 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
    index fd9a872..32aa691 100644
    --- a/fs/nfs/dir.c
    +++ b/fs/nfs/dir.c
    @@ -260,10 +260,10 @@ void nfs_readdir_clear_array(struct page *page)
    struct nfs_cache_array *array;
    int i;

    - array = kmap_atomic(page, KM_USER0);
    + array = kmap_atomic(page);
    for (i = 0; i < array->size; i++)
    kfree(array->array[i].string.name);
    - kunmap_atomic(array, KM_USER0);
    + kunmap_atomic(array);
    }

    /*
    @@ -1870,11 +1870,11 @@ static int nfs_symlink(struct inode *dir, struct dentry *dentry, const char *sym
    if (!page)
    return -ENOMEM;

    - kaddr = kmap_atomic(page, KM_USER0);
    + kaddr = kmap_atomic(page);
    memcpy(kaddr, symname, pathlen);
    if (pathlen < PAGE_SIZE)
    memset(kaddr + pathlen, 0, PAGE_SIZE - pathlen);
    - kunmap_atomic(kaddr, KM_USER0);
    + kunmap_atomic(kaddr);

    error = NFS_PROTO(dir)->symlink(dir, dentry, page, pathlen, &attr);
    if (error != 0) {
    diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
    index f0c849c..3c58843 100644
    --- a/fs/nfs/nfs4proc.c
    +++ b/fs/nfs/nfs4proc.c
    @@ -193,7 +193,7 @@ static void nfs4_setup_readdir(u64 cookie, __be32 *verifier, struct dentry *dent
    * when talking to the server, we always send cookie 0
    * instead of 1 or 2.
    */
    - start = p = kmap_atomic(*readdir->pages, KM_USER0);
    + start = p = kmap_atomic(*readdir->pages);

    if (cookie == 0) {
    *p++ = xdr_one; /* next */
    @@ -221,7 +221,7 @@ static void nfs4_setup_readdir(u64 cookie, __be32 *verifier, struct dentry *dent

    readdir->pgbase = (char *)p - (char *)start;
    readdir->count -= readdir->pgbase;
    - kunmap_atomic(start, KM_USER0);
    + kunmap_atomic(start);
    }

    static int nfs4_wait_clnt_recover(struct nfs_client *clp)
    --
    1.7.7.6


    \
     
     \ /
      Last update: 2012-02-10 06:53    [W:5.864 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site