2005-01-25 10:57:37

by Oleg Nesterov

Subject: [PATCH 4/4] blockable_page_cache_readahead() cleanup

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 <[email protected]>

--- 2.6.11-rc2/mm/readahead.c~ 2005-01-25 17:26:34.000000000 +0300
+++ 2.6.11-rc2/mm/readahead.c 2005-01-25 17:29:26.000000000 +0300
@@ -349,8 +349,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;
@@ -395,15 +395,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);
}

2005-01-25 22:53:57

by Steven Pratt

Subject: Re: [PATCH 4/4] blockable_page_cache_readahead() cleanup

No problem with this patch either. Again, not sure it buys much but it
should work fine.

Steve

Oleg Nesterov wrote:

>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 <[email protected]>
>
>--- 2.6.11-rc2/mm/readahead.c~ 2005-01-25 17:26:34.000000000 +0300
>+++ 2.6.11-rc2/mm/readahead.c 2005-01-25 17:29:26.000000000 +0300
>@@ -349,8 +349,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;
>@@ -395,15 +395,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);
> }
>
>