From: Fengguang Wu - remove unused local next_index in do_generic_mapping_read() - wrap a long line - remove a redudant page_cache_read() declaration Signed-off-by: Fengguang Wu Cc: Rusty Russell Signed-off-by: Andrew Morton --- mm/filemap.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff -puN mm/filemap.c~filemap-trivial-code-cleanups mm/filemap.c --- a/mm/filemap.c~filemap-trivial-code-cleanups +++ a/mm/filemap.c @@ -869,7 +869,6 @@ void do_generic_mapping_read(struct addr 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 addr 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; @@ -1217,7 +1215,8 @@ out: } EXPORT_SYMBOL(generic_file_aio_read); -int file_send_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size) +int file_send_actor(read_descriptor_t * desc, struct page *page, + unsigned long offset, unsigned long size) { ssize_t written; unsigned long count = desc->count; @@ -1270,7 +1269,6 @@ asmlinkage ssize_t sys_readahead(int fd, } #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 _