lkml.org 
[lkml]   [2011]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 39/62] logfs: remove the second argument of k[un]map_atomic()
    Date

    Signed-off-by: Cong Wang <amwang@redhat.com>
    ---
    fs/logfs/dir.c | 18 +++++++++---------
    fs/logfs/readwrite.c | 38 +++++++++++++++++++-------------------
    fs/logfs/segment.c | 4 ++--
    3 files changed, 30 insertions(+), 30 deletions(-)

    diff --git a/fs/logfs/dir.c b/fs/logfs/dir.c
    index b7d7f67..7c27519 100644
    --- a/fs/logfs/dir.c
    +++ b/fs/logfs/dir.c
    @@ -177,17 +177,17 @@ static struct page *logfs_get_dd_page(struct inode *dir, struct dentry *dentry)
    (filler_t *)logfs_readpage, NULL);
    if (IS_ERR(page))
    return page;
    - dd = kmap_atomic(page, KM_USER0);
    + dd = kmap_atomic(page);
    BUG_ON(dd->namelen == 0);

    if (name->len != be16_to_cpu(dd->namelen) ||
    memcmp(name->name, dd->name, name->len)) {
    - kunmap_atomic(dd, KM_USER0);
    + kunmap_atomic(dd);
    page_cache_release(page);
    continue;
    }

    - kunmap_atomic(dd, KM_USER0);
    + kunmap_atomic(dd);
    return page;
    }
    return NULL;
    @@ -365,9 +365,9 @@ static struct dentry *logfs_lookup(struct inode *dir, struct dentry *dentry,
    return NULL;
    }
    index = page->index;
    - dd = kmap_atomic(page, KM_USER0);
    + dd = kmap_atomic(page);
    ino = be64_to_cpu(dd->ino);
    - kunmap_atomic(dd, KM_USER0);
    + kunmap_atomic(dd);
    page_cache_release(page);

    inode = logfs_iget(dir->i_sb, ino);
    @@ -402,12 +402,12 @@ static int logfs_write_dir(struct inode *dir, struct dentry *dentry,
    if (!page)
    return -ENOMEM;

    - dd = kmap_atomic(page, KM_USER0);
    + dd = kmap_atomic(page);
    memset(dd, 0, sizeof(*dd));
    dd->ino = cpu_to_be64(inode->i_ino);
    dd->type = logfs_type(inode);
    logfs_set_name(dd, &dentry->d_name);
    - kunmap_atomic(dd, KM_USER0);
    + kunmap_atomic(dd);

    err = logfs_write_buf(dir, page, WF_LOCK);
    unlock_page(page);
    @@ -579,9 +579,9 @@ static int logfs_get_dd(struct inode *dir, struct dentry *dentry,
    if (IS_ERR(page))
    return PTR_ERR(page);
    *pos = page->index;
    - map = kmap_atomic(page, KM_USER0);
    + map = kmap_atomic(page);
    memcpy(dd, map, sizeof(*dd));
    - kunmap_atomic(map, KM_USER0);
    + kunmap_atomic(map);
    page_cache_release(page);
    return 0;
    }
    diff --git a/fs/logfs/readwrite.c b/fs/logfs/readwrite.c
    index 2ac4217..6d4029d 100644
    --- a/fs/logfs/readwrite.c
    +++ b/fs/logfs/readwrite.c
    @@ -519,9 +519,9 @@ static int indirect_write_alias(struct super_block *sb,

    ino = page->mapping->host->i_ino;
    logfs_unpack_index(page->index, &bix, &level);
    - child = kmap_atomic(page, KM_USER0);
    + child = kmap_atomic(page);
    val = child[pos];
    - kunmap_atomic(child, KM_USER0);
    + kunmap_atomic(child);
    err = write_one_alias(sb, ino, bix, level, pos, val);
    if (err)
    return err;
    @@ -667,9 +667,9 @@ static void alloc_indirect_block(struct inode *inode, struct page *page,
    alloc_data_block(inode, page);

    block = logfs_block(page);
    - array = kmap_atomic(page, KM_USER0);
    + array = kmap_atomic(page);
    initialize_block_counters(page, block, array, page_is_empty);
    - kunmap_atomic(array, KM_USER0);
    + kunmap_atomic(array);
    }

    static void block_set_pointer(struct page *page, int index, u64 ptr)
    @@ -679,10 +679,10 @@ static void block_set_pointer(struct page *page, int index, u64 ptr)
    u64 oldptr;

    BUG_ON(!block);
    - array = kmap_atomic(page, KM_USER0);
    + array = kmap_atomic(page);
    oldptr = be64_to_cpu(array[index]);
    array[index] = cpu_to_be64(ptr);
    - kunmap_atomic(array, KM_USER0);
    + kunmap_atomic(array);
    SetPageUptodate(page);

    block->full += !!(ptr & LOGFS_FULLY_POPULATED)
    @@ -695,9 +695,9 @@ static u64 block_get_pointer(struct page *page, int index)
    __be64 *block;
    u64 ptr;

    - block = kmap_atomic(page, KM_USER0);
    + block = kmap_atomic(page);
    ptr = be64_to_cpu(block[index]);
    - kunmap_atomic(block, KM_USER0);
    + kunmap_atomic(block);
    return ptr;
    }

    @@ -844,7 +844,7 @@ static u64 seek_holedata_loop(struct inode *inode, u64 bix, int data)
    }

    slot = get_bits(bix, SUBLEVEL(level));
    - rblock = kmap_atomic(page, KM_USER0);
    + rblock = kmap_atomic(page);
    while (slot < LOGFS_BLOCK_FACTOR) {
    if (data && (rblock[slot] != 0))
    break;
    @@ -855,12 +855,12 @@ static u64 seek_holedata_loop(struct inode *inode, u64 bix, int data)
    bix &= ~(increment - 1);
    }
    if (slot >= LOGFS_BLOCK_FACTOR) {
    - kunmap_atomic(rblock, KM_USER0);
    + kunmap_atomic(rblock);
    logfs_put_read_page(page);
    return bix;
    }
    bofs = be64_to_cpu(rblock[slot]);
    - kunmap_atomic(rblock, KM_USER0);
    + kunmap_atomic(rblock);
    logfs_put_read_page(page);
    if (!bofs) {
    BUG_ON(data);
    @@ -1944,9 +1944,9 @@ int logfs_read_inode(struct inode *inode)
    if (IS_ERR(page))
    return PTR_ERR(page);

    - di = kmap_atomic(page, KM_USER0);
    + di = kmap_atomic(page);
    logfs_disk_to_inode(di, inode);
    - kunmap_atomic(di, KM_USER0);
    + kunmap_atomic(di);
    move_page_to_inode(inode, page);
    page_cache_release(page);
    return 0;
    @@ -1965,9 +1965,9 @@ static struct page *inode_to_page(struct inode *inode)
    if (!page)
    return NULL;

    - di = kmap_atomic(page, KM_USER0);
    + di = kmap_atomic(page);
    logfs_inode_to_disk(inode, di);
    - kunmap_atomic(di, KM_USER0);
    + kunmap_atomic(di);
    move_inode_to_page(page, inode);
    return page;
    }
    @@ -2024,13 +2024,13 @@ static void logfs_mod_segment_entry(struct super_block *sb, u32 segno,

    if (write)
    alloc_indirect_block(inode, page, 0);
    - se = kmap_atomic(page, KM_USER0);
    + se = kmap_atomic(page);
    change_se(se + child_no, arg);
    if (write) {
    logfs_set_alias(sb, logfs_block(page), child_no);
    BUG_ON((int)be32_to_cpu(se[child_no].valid) > super->s_segsize);
    }
    - kunmap_atomic(se, KM_USER0);
    + kunmap_atomic(se);

    logfs_put_write_page(page);
    }
    @@ -2228,10 +2228,10 @@ int logfs_inode_write(struct inode *inode, const void *buf, size_t count,
    if (!page)
    return -ENOMEM;

    - pagebuf = kmap_atomic(page, KM_USER0);
    + pagebuf = kmap_atomic(page);
    memcpy(pagebuf, buf, count);
    flush_dcache_page(page);
    - kunmap_atomic(pagebuf, KM_USER0);
    + kunmap_atomic(pagebuf);

    if (i_size_read(inode) < pos + LOGFS_BLOCKSIZE)
    i_size_write(inode, pos + LOGFS_BLOCKSIZE);
    diff --git a/fs/logfs/segment.c b/fs/logfs/segment.c
    index 9d51873..e4bc46c 100644
    --- a/fs/logfs/segment.c
    +++ b/fs/logfs/segment.c
    @@ -529,9 +529,9 @@ void move_page_to_btree(struct page *page)
    BUG_ON(!item); /* mempool empty */
    memset(item, 0, sizeof(*item));

    - child = kmap_atomic(page, KM_USER0);
    + child = kmap_atomic(page);
    item->val = child[pos];
    - kunmap_atomic(child, KM_USER0);
    + kunmap_atomic(child);
    item->child_no = pos;
    list_add(&item->list, &block->item_list);
    }
    --
    1.7.4.4


    \
     
     \ /
      Last update: 2011-11-27 06:39    [W:4.205 / U:24.120 seconds]
    ©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site