From 2164be7b0810950a0b54091196565c295f07b5c7 Mon Sep 17 00:00:00 2001 From: Fengguang Wu Date: Tue, 16 Oct 2007 01:24:37 -0700 Subject: [PATCH] --- yaml --- r: 69600 b: refs/heads/master c: b2c3843b1e25e2c67347c4671f33fbe6f5067e6b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/filemap.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5850115304a2..4b9ade4fc053 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2e189827a914b66e435e68b1c9e37775cb995ed +refs/heads/master: b2c3843b1e25e2c67347c4671f33fbe6f5067e6b diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c index 3c97bdc74a85..c1b94054cbbe 100644 --- a/trunk/mm/filemap.c +++ b/trunk/mm/filemap.c @@ -869,7 +869,6 @@ void do_generic_mapping_read(struct address_space *mapping, unsigned long index; unsigned long offset; unsigned long last_index; - unsigned long next_index; unsigned long prev_index; unsigned int prev_offset; struct page *cached_page; @@ -877,7 +876,6 @@ void do_generic_mapping_read(struct address_space *mapping, cached_page = NULL; index = *ppos >> PAGE_CACHE_SHIFT; - next_index = index; prev_index = ra->prev_pos >> PAGE_CACHE_SHIFT; prev_offset = ra->prev_pos & (PAGE_CACHE_SIZE-1); 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) } #ifdef CONFIG_MMU -static int FASTCALL(page_cache_read(struct file * file, unsigned long offset)); /** * page_cache_read - adds requested page to the page cache if not already there * @file: file to read