lkml.org 
[lkml]   [2007]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 4/13] ext3: use zero_user_page
    Use zero_user_page() instead of open-coding it. 

    Signed-off-by: Nate Diller <nate.diller@gmail.com>

    ---

    diff -urpN -X dontdiff linux-2.6.21-rc6-mm1/fs/ext3/inode.c linux-2.6.21-rc6-mm1-test/fs/ext3/inode.c
    --- linux-2.6.21-rc6-mm1/fs/ext3/inode.c 2007-04-09 17:24:03.000000000 -0700
    +++ linux-2.6.21-rc6-mm1-test/fs/ext3/inode.c 2007-04-09 18:18:23.000000000 -0700
    @@ -1767,7 +1767,6 @@ static int ext3_block_truncate_page(hand
    struct inode *inode = mapping->host;
    struct buffer_head *bh;
    int err = 0;
    - void *kaddr;

    blocksize = inode->i_sb->s_blocksize;
    length = blocksize - (offset & (blocksize - 1));
    @@ -1779,10 +1778,7 @@ static int ext3_block_truncate_page(hand
    */
    if (!page_has_buffers(page) && test_opt(inode->i_sb, NOBH) &&
    ext3_should_writeback_data(inode) && PageUptodate(page)) {
    - kaddr = kmap_atomic(page, KM_USER0);
    - memset(kaddr + offset, 0, length);
    - flush_dcache_page(page);
    - kunmap_atomic(kaddr, KM_USER0);
    + zero_user_page(page, offset, length);
    set_page_dirty(page);
    goto unlock;
    }
    @@ -1835,11 +1831,7 @@ static int ext3_block_truncate_page(hand
    goto unlock;
    }

    - kaddr = kmap_atomic(page, KM_USER0);
    - memset(kaddr + offset, 0, length);
    - flush_dcache_page(page);
    - kunmap_atomic(kaddr, KM_USER0);
    -
    + zero_user_page(page, offset, length);
    BUFFER_TRACE(bh, "zeroed end of block");

    err = 0;
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-04-11 05:45    [W:0.021 / U:1.764 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site