Use page_cache_xxx in drivers/block/rd.c
Reviewed-by: Dave Chinner <dgc@xxxxxxx>
Signed-off-by: Christoph Lameter <clameter@xxxxxxx>
---
drivers/block/rd.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: mm/drivers/block/rd.c
===================================================================
--- mm.orig/drivers/block/rd.c 2007-11-28 16:54:34.007439863 -0800
+++ mm/drivers/block/rd.c 2007-11-29 11:23:58.900823092 -0800
@@ -122,7 +122,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);
@@ -215,9 +215,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_shift(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;
@@ -227,7 +227,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-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
