[20/36] Use page_cache_xxx in drivers/block/rd.c

clameter
2007-08-28T19:22:29Z

[-- Attachment #1: 0020-Use-page_cache_xxx-in-drivers-block-rd.c.patch --]
[-- Type: text/plain, Size: 1423 bytes --]

Use page_cache_xxx in drivers/block/rd.c

Signed-off-by: Christoph Lameter <clameter@sgi.com>
---
drivers/block/rd.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/block/rd.c b/drivers/block/rd.c
index 65150b5..e148b3b 100644
--- a/drivers/block/rd.c
+++ b/drivers/block/rd.c
@@ -121,7 +121,7 @@ static void make_page_uptodate(struct page *page)
}
} 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_operations ramdisk_aops = {
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, struct bio_vec *vec, sector_t sector,
char *src;
char *dst;

- count = PAGE_CACHE_SIZE - offset;
+ count = page_cache_size(mapping) - offset;
if (count > size)
count = size;
size -= count;
--
1.5.2.4

--