adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

readahead: move max_sane_readahead() calls into force_page_cache_readahead()

Browse source 
Impact: code simplification.

Cc: Nick Piggin <npiggin@suse.de>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Cc: Ying Han <yinghan@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Wu Fengguang 2009-06-16 15:31:20 -07:00 committed by Linus Torvalds
parent 1ebf26a9b3
commit f7e839dd36
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mm/fadvise.c
View file

@ -101,7 +101,7 @@ SYSCALL_DEFINE(fadvise64_64)(int fd, loff_t offset, loff_t len, int advice)
ret = force_page_cache_readahead(mapping, file, ret = force_page_cache_readahead(mapping, file,
start_index, start_index,
max_sane_readahead(nrpages)); nrpages);
if (ret > 0) if (ret > 0)
ret = 0; ret = 0;
break; break;

3
mm/filemap.c
View file

@ -1390,8 +1390,7 @@ do_readahead(struct address_space *mapping, struct file *filp,
if (!mapping || !mapping->a_ops || !mapping->a_ops->readpage) if (!mapping || !mapping->a_ops || !mapping->a_ops->readpage)
return -EINVAL; return -EINVAL;
force_page_cache_readahead(mapping, filp, index, force_page_cache_readahead(mapping, filp, index, nr);
max_sane_readahead(nr));
return 0; return 0;
} }

3
mm/madvise.c
View file

@ -123,8 +123,7 @@ static long madvise_willneed(struct vm_area_struct * vma,
end = vma->vm_end; end = vma->vm_end;
end = ((end - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff; end = ((end - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
force_page_cache_readahead(file->f_mapping, force_page_cache_readahead(file->f_mapping, file, start, end - start);
file, start, max_sane_readahead(end - start));
return 0; return 0;
} }

1
mm/readahead.c
View file

@ -210,6 +210,7 @@ int force_page_cache_readahead(struct address_space *mapping, struct file *filp,
if (unlikely(!mapping->a_ops->readpage && !mapping->a_ops->readpages)) if (unlikely(!mapping->a_ops->readpage && !mapping->a_ops->readpages))
return -EINVAL; return -EINVAL;
nr_to_read = max_sane_readahead(nr_to_read);
while (nr_to_read) { while (nr_to_read) {
int err; int err;