lkml.org 
[lkml]   [2007]   [Jun]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[12/37] Use page_cache_xxx in mm/mpage.c
    Signed-off-by: Christoph Lameter <clameter@sgi.com>

    ---
    fs/mpage.c | 28 ++++++++++++++++------------
    1 file changed, 16 insertions(+), 12 deletions(-)

    Index: vps/fs/mpage.c
    ===================================================================
    --- vps.orig/fs/mpage.c 2007-06-11 22:33:07.000000000 -0700
    +++ vps/fs/mpage.c 2007-06-11 22:37:24.000000000 -0700
    @@ -133,7 +133,8 @@ mpage_alloc(struct block_device *bdev,
    static void
    map_buffer_to_page(struct page *page, struct buffer_head *bh, int page_block)
    {
    - struct inode *inode = page->mapping->host;
    + struct address_space *mapping = page->mapping;
    + struct inode *inode = mapping->host;
    struct buffer_head *page_bh, *head;
    int block = 0;

    @@ -142,9 +143,9 @@ map_buffer_to_page(struct page *page, st
    * don't make any buffers if there is only one buffer on
    * the page and the page just needs to be set up to date
    */
    - if (inode->i_blkbits == PAGE_CACHE_SHIFT &&
    + if (inode->i_blkbits == page_cache_shift(mapping) &&
    buffer_uptodate(bh)) {
    - SetPageUptodate(page);
    + SetPageUptodate(page);
    return;
    }
    create_empty_buffers(page, 1 << inode->i_blkbits, 0);
    @@ -177,9 +178,10 @@ do_mpage_readpage(struct bio *bio, struc
    sector_t *last_block_in_bio, struct buffer_head *map_bh,
    unsigned long *first_logical_block, get_block_t get_block)
    {
    - struct inode *inode = page->mapping->host;
    + struct address_space *mapping = page->mapping;
    + struct inode *inode = mapping->host;
    const unsigned blkbits = inode->i_blkbits;
    - const unsigned blocks_per_page = PAGE_CACHE_SIZE >> blkbits;
    + const unsigned blocks_per_page = page_cache_size(mapping) >> blkbits;
    const unsigned blocksize = 1 << blkbits;
    sector_t block_in_file;
    sector_t last_block;
    @@ -196,7 +198,7 @@ do_mpage_readpage(struct bio *bio, struc
    if (page_has_buffers(page))
    goto confused;

    - block_in_file = (sector_t)page->index << (PAGE_CACHE_SHIFT - blkbits);
    + block_in_file = (sector_t)page->index << (page_cache_shift(mapping) - blkbits);
    last_block = block_in_file + nr_pages * blocks_per_page;
    last_block_in_file = (i_size_read(inode) + blocksize - 1) >> blkbits;
    if (last_block > last_block_in_file)
    @@ -284,7 +286,8 @@ do_mpage_readpage(struct bio *bio, struc
    }

    if (first_hole != blocks_per_page) {
    - zero_user_segment(page, first_hole << blkbits, PAGE_CACHE_SIZE);
    + zero_user_segment(page, first_hole << blkbits,
    + page_cache_size(mapping));
    if (first_hole == 0) {
    SetPageUptodate(page);
    unlock_page(page);
    @@ -462,7 +465,7 @@ static int __mpage_writepage(struct page
    struct inode *inode = page->mapping->host;
    const unsigned blkbits = inode->i_blkbits;
    unsigned long end_index;
    - const unsigned blocks_per_page = PAGE_CACHE_SIZE >> blkbits;
    + const unsigned blocks_per_page = page_cache_size(mapping) >> blkbits;
    sector_t last_block;
    sector_t block_in_file;
    sector_t blocks[MAX_BUF_PER_PAGE];
    @@ -531,7 +534,8 @@ static int __mpage_writepage(struct page
    * The page has no buffers: map it to disk
    */
    BUG_ON(!PageUptodate(page));
    - block_in_file = (sector_t)page->index << (PAGE_CACHE_SHIFT - blkbits);
    + block_in_file = (sector_t)page->index <<
    + (page_cache_shift(mapping) - blkbits);
    last_block = (i_size - 1) >> blkbits;
    map_bh.b_page = page;
    for (page_block = 0; page_block < blocks_per_page; ) {
    @@ -563,7 +567,7 @@ static int __mpage_writepage(struct page
    first_unmapped = page_block;

    page_is_mapped:
    - end_index = i_size >> PAGE_CACHE_SHIFT;
    + end_index = page_cache_index(mapping, i_size);
    if (page->index >= end_index) {
    /*
    * The page straddles i_size. It must be zeroed out on each
    @@ -573,11 +577,11 @@ page_is_mapped:
    * is zeroed when mapped, and writes to that region are not
    * written out to the file."
    */
    - unsigned offset = i_size & (PAGE_CACHE_SIZE - 1);
    + unsigned offset = page_cache_offset(mapping, i_size);

    if (page->index > end_index || !offset)
    goto confused;
    - zero_user_segment(page, offset, PAGE_CACHE_SIZE);
    + zero_user_segment(page, offset, page_cache_size(mapping));
    }

    /*
    --
    -
    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-06-20 20:47    [W:0.024 / U:124.836 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site