From: Oleg Nesterov <oleg@tv-sign.ru>
I think that do_page_cache_readahead() can be inlined in
blockable_page_cache_readahead(), this makes the code a bit more readable in
my opinion.
Also makes check_ra_success() static inline.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/mm/readahead.c | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff -puN mm/readahead.c~readahead-cleanup-blockable_page_cache_readahead mm/readahead.c
--- 25/mm/readahead.c~readahead-cleanup-blockable_page_cache_readahead 2005-02-24 21:03:20.000000000 -0800
+++ 25-akpm/mm/readahead.c 2005-02-24 21:03:20.000000000 -0800
@@ -348,8 +348,8 @@ int force_page_cache_readahead(struct ad
* readahead isn't helping.
*
*/
-int check_ra_success(struct file_ra_state *ra, unsigned long nr_to_read,
- unsigned long actual)
+static inline int check_ra_success(struct file_ra_state *ra,
+ unsigned long nr_to_read, unsigned long actual)
{
if (actual == 0) {
ra->cache_hit += nr_to_read;
@@ -394,15 +394,11 @@ blockable_page_cache_readahead(struct ad
{
int actual;
- if (block) {
- actual = __do_page_cache_readahead(mapping, filp,
- offset, nr_to_read);
- } else {
- actual = do_page_cache_readahead(mapping, filp,
- offset, nr_to_read);
- if (actual == -1)
- return 0;
- }
+ if (!block && bdi_read_congested(mapping->backing_dev_info))
+ return 0;
+
+ actual = __do_page_cache_readahead(mapping, filp, offset, nr_to_read);
+
return check_ra_success(ra, nr_to_read, actual);
}
_