Land b_smallfix onto b1_2 (20040302_2126)

b=2809, b=2706, b=2816, b=1987, b=2884, b=1191, b=2765, b=2805

diff --git a/lustre/llite/rw.c b/lustre/llite/rw.c
index f4f9666..08ae222 100644 (file)
--- a/lustre/llite/rw.c
+++ b/lustre/llite/rw.c
@@ -608,14 +608,10 @@ static void ll_readahead(struct ll_readahead_state *ras,
                 if (page == NULL)
                        break;
 
-                /* Don't try to readahead beyond the end of the lock extent */
-                if (ll_page_matches(page) <= 0)
-                       break;
-
                 /* the book-keeping above promises that we've tried
                  * all the indices from start to end, so we don't
                  * stop if anyone returns an error. This may not be good. */
-                if (Page_Uptodate(page))
+                if (Page_Uptodate(page) || ll_page_matches(page) <= 0)
                         goto next_page;
 
                 llap = llap_from_page(page);