From: Fengguang Wu Date: Tue, 16 Oct 2007 08:24:31 +0000 (-0700) Subject: readahead: compacting file_ra_state X-Git-Tag: v2.6.24-rc1~1237 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=937085aa35cc873d427d250a1e304d641af24628;p=linux-2.6 readahead: compacting file_ra_state Use 'unsigned int' instead of 'unsigned long' for readahead sizes. This helps reduce memory consumption on 64bit CPU when a lot of files are opened. CC: Andi Kleen Signed-off-by: Fengguang Wu Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/include/linux/fs.h b/include/linux/fs.h index 4a6a21077b..7a998c49a0 100644 --- a/include/linux/fs.h +++ b/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/mm/readahead.c b/mm/readahead.c index be20c9d699..d2504877b2 100644 --- a/mm/readahead.c +++ b/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;