aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2008-02-08 07:20:11 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-08 12:22:32 -0500
commit2004dc8eec1b4f0692b3be87ea80c70faa44d619 (patch)
tree9458abfdecf29c08a33cccb845eb273c70ad49c5
parent476aed3870b26735c4fcfdaa95420fa9e1de5119 (diff)
Use pgoff_t instead of unsigned long
Convert variables containing page indexes to pgoff_t. Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/filemap.c2
-rw-r--r--mm/filemap_xip.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/mm/filemap.c b/mm/filemap.c
index 5357fcc4643b..4eb958c402fe 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1332,7 +1332,7 @@ int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
1332 struct file_ra_state *ra = &file->f_ra; 1332 struct file_ra_state *ra = &file->f_ra;
1333 struct inode *inode = mapping->host; 1333 struct inode *inode = mapping->host;
1334 struct page *page; 1334 struct page *page;
1335 unsigned long size; 1335 pgoff_t size;
1336 int did_readaround = 0; 1336 int did_readaround = 0;
1337 int ret = 0; 1337 int ret = 0;
1338 1338
diff --git a/mm/filemap_xip.c b/mm/filemap_xip.c
index 0420a0292b03..5e598c42afd7 100644
--- a/mm/filemap_xip.c
+++ b/mm/filemap_xip.c
@@ -56,7 +56,8 @@ do_xip_mapping_read(struct address_space *mapping,
56 read_actor_t actor) 56 read_actor_t actor)
57{ 57{
58 struct inode *inode = mapping->host; 58 struct inode *inode = mapping->host;
59 unsigned long index, end_index, offset; 59 pgoff_t index, end_index;
60 unsigned long offset;
60 loff_t isize; 61 loff_t isize;
61 62
62 BUG_ON(!mapping->a_ops->get_xip_page); 63 BUG_ON(!mapping->a_ops->get_xip_page);