aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFengguang Wu <wfg@mail.ustc.edu.cn>2007-10-16 04:24:37 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 12:42:53 -0400
commitb2c3843b1e25e2c67347c4671f33fbe6f5067e6b (patch)
treee1b161e5c7169baab8f71615879eb3b46ebe9a9e
parentf2e189827a914b66e435e68b1c9e37775cb995ed (diff)
filemap: trivial code cleanups
- remove unused local next_index in do_generic_mapping_read() - remove a redudant page_cache_read() declaration Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn> Cc: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/filemap.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/mm/filemap.c b/mm/filemap.c
index 3c97bdc74a85..c1b94054cbbe 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -869,7 +869,6 @@ void do_generic_mapping_read(struct address_space *mapping,
869 unsigned long index; 869 unsigned long index;
870 unsigned long offset; 870 unsigned long offset;
871 unsigned long last_index; 871 unsigned long last_index;
872 unsigned long next_index;
873 unsigned long prev_index; 872 unsigned long prev_index;
874 unsigned int prev_offset; 873 unsigned int prev_offset;
875 struct page *cached_page; 874 struct page *cached_page;
@@ -877,7 +876,6 @@ void do_generic_mapping_read(struct address_space *mapping,
877 876
878 cached_page = NULL; 877 cached_page = NULL;
879 index = *ppos >> PAGE_CACHE_SHIFT; 878 index = *ppos >> PAGE_CACHE_SHIFT;
880 next_index = index;
881 prev_index = ra->prev_pos >> PAGE_CACHE_SHIFT; 879 prev_index = ra->prev_pos >> PAGE_CACHE_SHIFT;
882 prev_offset = ra->prev_pos & (PAGE_CACHE_SIZE-1); 880 prev_offset = ra->prev_pos & (PAGE_CACHE_SIZE-1);
883 last_index = (*ppos + desc->count + PAGE_CACHE_SIZE-1) >> PAGE_CACHE_SHIFT; 881 last_index = (*ppos + desc->count + PAGE_CACHE_SIZE-1) >> PAGE_CACHE_SHIFT;
@@ -1250,7 +1248,6 @@ asmlinkage ssize_t sys_readahead(int fd, loff_t offset, size_t count)
1250} 1248}
1251 1249
1252#ifdef CONFIG_MMU 1250#ifdef CONFIG_MMU
1253static int FASTCALL(page_cache_read(struct file * file, unsigned long offset));
1254/** 1251/**
1255 * page_cache_read - adds requested page to the page cache if not already there 1252 * page_cache_read - adds requested page to the page cache if not already there
1256 * @file: file to read 1253 * @file: file to read