Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 69600
b: refs/heads/master
c: b2c3843
h: refs/heads/master
v: v3
  • Loading branch information
Fengguang Wu authored and Linus Torvalds committed Oct 16, 2007
1 parent 868bb83 commit 2164be7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f2e189827a914b66e435e68b1c9e37775cb995ed
refs/heads/master: b2c3843b1e25e2c67347c4671f33fbe6f5067e6b
3 changes: 0 additions & 3 deletions trunk/mm/filemap.c
Original file line number Diff line number Diff line change
Expand Up @@ -869,15 +869,13 @@ 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;
int error;

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;
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 2164be7

Please sign in to comment.