summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2008-02-08 04:20:11 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-08 09:22:32 -0800
commit2004dc8eec1b4f0692b3be87ea80c70faa44d619 (patch)
tree9458abfdecf29c08a33cccb845eb273c70ad49c5
parent476aed3870b26735c4fcfdaa95420fa9e1de5119 (diff)
downloadop-kernel-dev-2004dc8eec1b4f0692b3be87ea80c70faa44d619.zip
op-kernel-dev-2004dc8eec1b4f0692b3be87ea80c70faa44d619.tar.gz
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 5357fcc..4eb958c 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)
struct file_ra_state *ra = &file->f_ra;
struct inode *inode = mapping->host;
struct page *page;
- unsigned long size;
+ pgoff_t size;
int did_readaround = 0;
int ret = 0;
diff --git a/mm/filemap_xip.c b/mm/filemap_xip.c
index 0420a02..5e598c4 100644
--- a/mm/filemap_xip.c
+++ b/mm/filemap_xip.c
@@ -56,7 +56,8 @@ do_xip_mapping_read(struct address_space *mapping,
read_actor_t actor)
{
struct inode *inode = mapping->host;
- unsigned long index, end_index, offset;
+ pgoff_t index, end_index;
+ unsigned long offset;
loff_t isize;
BUG_ON(!mapping->a_ops->get_xip_page);
OpenPOWER on IntegriCloud