lkml.org 
[lkml]   [2007]   [Sep]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[17/41] Use page_cache_xxx in fs/ext4
    Use page_cache_xxx in fs/ext4

    Signed-off-by: Christoph Lameter <clameter@sgi.com>
    ---
    fs/ext4/dir.c | 3 ++-
    fs/ext4/inode.c | 31 ++++++++++++++++---------------
    2 files changed, 18 insertions(+), 16 deletions(-)

    Index: linux-2.6/fs/ext4/dir.c
    ===================================================================
    --- linux-2.6.orig/fs/ext4/dir.c 2007-08-30 23:16:52.000000000 -0700
    +++ linux-2.6/fs/ext4/dir.c 2007-08-30 23:17:33.000000000 -0700
    @@ -136,7 +136,8 @@ static int ext4_readdir(struct file * fi
    err = ext4_get_blocks_wrap(NULL, inode, blk, 1, &map_bh, 0, 0);
    if (err > 0) {
    pgoff_t index = map_bh.b_blocknr >>
    - (PAGE_CACHE_SHIFT - inode->i_blkbits);
    + (page_cache_size(inode->i_mapping)
    + - inode->i_blkbits);
    if (!ra_has_index(&filp->f_ra, index))
    page_cache_sync_readahead(
    sb->s_bdev->bd_inode->i_mapping,
    Index: linux-2.6/fs/ext4/inode.c
    ===================================================================
    --- linux-2.6.orig/fs/ext4/inode.c 2007-08-30 23:17:11.000000000 -0700
    +++ linux-2.6/fs/ext4/inode.c 2007-08-30 23:17:11.000000000 -0700
    @@ -1223,7 +1223,7 @@ static int ext4_ordered_commit_write(str
    */
    loff_t new_i_size;

    - new_i_size = ((loff_t)page->index << PAGE_CACHE_SHIFT) + to;
    + new_i_size = page_cache_pos(page->mapping, page->index, to);
    if (new_i_size > EXT4_I(inode)->i_disksize)
    EXT4_I(inode)->i_disksize = new_i_size;
    ret = generic_commit_write(file, page, from, to);
    @@ -1242,7 +1242,7 @@ static int ext4_writeback_commit_write(s
    int ret = 0, ret2;
    loff_t new_i_size;

    - new_i_size = ((loff_t)page->index << PAGE_CACHE_SHIFT) + to;
    + new_i_size = page_cache_pos(page->mapping, page->index, to);
    if (new_i_size > EXT4_I(inode)->i_disksize)
    EXT4_I(inode)->i_disksize = new_i_size;

    @@ -1269,7 +1269,7 @@ static int ext4_journalled_commit_write(
    /*
    * Here we duplicate the generic_commit_write() functionality
    */
    - pos = ((loff_t)page->index << PAGE_CACHE_SHIFT) + to;
    + pos = page_cache_pos(page->mapping, page->index, to);

    ret = walk_page_buffers(handle, page_buffers(page), from,
    to, &partial, commit_write_fn);
    @@ -1421,6 +1421,7 @@ static int ext4_ordered_writepage(struct
    handle_t *handle = NULL;
    int ret = 0;
    int err;
    + int pagesize = page_cache_size(inode->i_mapping);

    J_ASSERT(PageLocked(page));

    @@ -1443,8 +1444,7 @@ static int ext4_ordered_writepage(struct
    (1 << BH_Dirty)|(1 << BH_Uptodate));
    }
    page_bufs = page_buffers(page);
    - walk_page_buffers(handle, page_bufs, 0,
    - PAGE_CACHE_SIZE, NULL, bget_one);
    + walk_page_buffers(handle, page_bufs, 0, pagesize, NULL, bget_one);

    ret = block_write_full_page(page, ext4_get_block, wbc);

    @@ -1461,13 +1461,12 @@ static int ext4_ordered_writepage(struct
    * and generally junk.
    */
    if (ret == 0) {
    - err = walk_page_buffers(handle, page_bufs, 0, PAGE_CACHE_SIZE,
    + err = walk_page_buffers(handle, page_bufs, 0, pagesize,
    NULL, jbd2_journal_dirty_data_fn);
    if (!ret)
    ret = err;
    }
    - walk_page_buffers(handle, page_bufs, 0,
    - PAGE_CACHE_SIZE, NULL, bput_one);
    + walk_page_buffers(handle, page_bufs, 0, pagesize, NULL, bput_one);
    err = ext4_journal_stop(handle);
    if (!ret)
    ret = err;
    @@ -1519,6 +1518,7 @@ static int ext4_journalled_writepage(str
    handle_t *handle = NULL;
    int ret = 0;
    int err;
    + int pagesize = page_cache_size(inode->i_mapping);

    if (ext4_journal_current_handle())
    goto no_write;
    @@ -1535,17 +1535,17 @@ static int ext4_journalled_writepage(str
    * doesn't seem much point in redirtying the page here.
    */
    ClearPageChecked(page);
    - ret = block_prepare_write(page, 0, PAGE_CACHE_SIZE,
    + ret = block_prepare_write(page, 0, pagesize,
    ext4_get_block);
    if (ret != 0) {
    ext4_journal_stop(handle);
    goto out_unlock;
    }
    ret = walk_page_buffers(handle, page_buffers(page), 0,
    - PAGE_CACHE_SIZE, NULL, do_journal_get_write_access);
    + pagesize, NULL, do_journal_get_write_access);

    err = walk_page_buffers(handle, page_buffers(page), 0,
    - PAGE_CACHE_SIZE, NULL, commit_write_fn);
    + pagesize, NULL, commit_write_fn);
    if (ret == 0)
    ret = err;
    EXT4_I(inode)->i_state |= EXT4_STATE_JDATA;
    @@ -1760,8 +1760,8 @@ void ext4_set_aops(struct inode *inode)
    int ext4_block_truncate_page(handle_t *handle, struct page *page,
    struct address_space *mapping, loff_t from)
    {
    - ext4_fsblk_t index = from >> PAGE_CACHE_SHIFT;
    - unsigned offset = from & (PAGE_CACHE_SIZE-1);
    + ext4_fsblk_t index = page_cache_index(mapping, from);
    + unsigned offset = page_cache_offset(mapping, from);
    unsigned blocksize, iblock, length, pos;
    struct inode *inode = mapping->host;
    struct buffer_head *bh;
    @@ -1769,7 +1769,8 @@ int ext4_block_truncate_page(handle_t *h

    blocksize = inode->i_sb->s_blocksize;
    length = blocksize - (offset & (blocksize - 1));
    - iblock = index << (PAGE_CACHE_SHIFT - inode->i_sb->s_blocksize_bits);
    + iblock = index <<
    + (page_cache_shift(mapping) - inode->i_sb->s_blocksize_bits);

    /*
    * For "nobh" option, we can only work if we don't need to
    @@ -2249,7 +2250,7 @@ void ext4_truncate(struct inode *inode)
    page = NULL;
    } else {
    page = grab_cache_page(mapping,
    - inode->i_size >> PAGE_CACHE_SHIFT);
    + page_cache_index(mapping, inode->i_size));
    if (!page)
    return;
    }
    --
    -
    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-09-11 08:11    [W:0.029 / U:60.436 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site