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[22/37] Use page_cache_xxx in drivers/block/rd.c
    Signed-off-by: Christoph Lameter <clameter@sgi.com>

    ---
    drivers/block/rd.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    Index: vps/drivers/block/rd.c
    ===================================================================
    --- vps.orig/drivers/block/rd.c 2007-06-14 21:49:09.000000000 -0700
    +++ vps/drivers/block/rd.c 2007-06-14 21:50:28.000000000 -0700
    @@ -121,7 +121,7 @@ static void make_page_uptodate(struct pa
    }
    } while ((bh = bh->b_this_page) != head);
    } else {
    - memset(page_address(page), 0, PAGE_CACHE_SIZE);
    + memset(page_address(page), 0, page_cache_size(page_mapping(page)));
    }
    flush_dcache_page(page);
    SetPageUptodate(page);
    @@ -201,9 +201,9 @@ static const struct address_space_operat
    static int rd_blkdev_pagecache_IO(int rw, struct bio_vec *vec, sector_t sector,
    struct address_space *mapping)
    {
    - pgoff_t index = sector >> (PAGE_CACHE_SHIFT - 9);
    + pgoff_t index = sector >> (page_cache_size(mapping) - 9);
    unsigned int vec_offset = vec->bv_offset;
    - int offset = (sector << 9) & ~PAGE_CACHE_MASK;
    + int offset = page_cache_offset(mapping, (sector << 9));
    int size = vec->bv_len;
    int err = 0;

    @@ -213,7 +213,7 @@ static int rd_blkdev_pagecache_IO(int rw
    char *src;
    char *dst;

    - count = PAGE_CACHE_SIZE - offset;
    + count = page_cache_size(mapping) - offset;
    if (count > size)
    count = size;
    size -= count;
    --
    -
    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:39    [W:0.026 / U:0.264 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site