From 372a57ad4d8014dc4c7ee8ed12b7924a5acdae76 Mon Sep 17 00:00:00 2001 From: Fengguang Wu Date: Tue, 16 Oct 2007 01:24:31 -0700 Subject: [PATCH] --- yaml --- r: 69592 b: refs/heads/master c: 937085aa35cc873d427d250a1e304d641af24628 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/fs.h | 8 ++++---- trunk/mm/readahead.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 2f8f77ce095e..d44e548d27c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43fac94dd62667c83dd2daa5b7ac548512af780a +refs/heads/master: 937085aa35cc873d427d250a1e304d641af24628 diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index 4a6a21077bae..7a998c49a086 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/include/linux/fs.h @@ -697,12 +697,12 @@ struct fown_struct { * Track a single file's readahead state */ struct file_ra_state { - pgoff_t start; /* where readahead started */ - unsigned long size; /* # of readahead pages */ - unsigned long async_size; /* do asynchronous readahead when + pgoff_t start; /* where readahead started */ + unsigned int size; /* # of readahead pages */ + unsigned int async_size; /* do asynchronous readahead when there are only # of pages ahead */ - unsigned long ra_pages; /* Maximum readahead window */ + unsigned int ra_pages; /* Maximum readahead window */ unsigned long mmap_hit; /* Cache hit stat for mmap accesses */ unsigned long mmap_miss; /* Cache miss stat for mmap accesses */ unsigned long prev_index; /* Cache last read() position */ diff --git a/trunk/mm/readahead.c b/trunk/mm/readahead.c index be20c9d699d3..d2504877b269 100644 --- a/trunk/mm/readahead.c +++ b/trunk/mm/readahead.c @@ -351,7 +351,7 @@ ondemand_readahead(struct address_space *mapping, bool hit_readahead_marker, pgoff_t offset, unsigned long req_size) { - unsigned long max; /* max readahead pages */ + int max; /* max readahead pages */ int sequential; max = ra->ra_pages;