Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	include/linux/kernel.h

1 files changed, 16 insertions, 6 deletions

diff --git a/mm/truncate.c b/mm/truncate.c
index 6cb3fff25f67..cf1b015df4a7 100644
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@ -230,14 +230,24 @@ unsigned long invalidate_mapping_pages(struct address_space *mapping,
                         pagevec_lookup(&pvec, mapping, next, PAGEVEC_SIZE)) {
                 for (i = 0; i < pagevec_count(&pvec); i++) {
                         struct page *page = pvec.pages[i];
+                        pgoff_t index;
+                        int lock_failed;
 
-                        if (TestSetPageLocked(page)) {
-                                next++;
-                                continue;
-                        }
-                        if (page->index > next)
-                                next = page->index;
+                        lock_failed = TestSetPageLocked(page);
+
+                        /*
+                         * We really shouldn't be looking at the ->index of an
+                         * unlocked page.  But we're not allowed to lock these
+                         * pages.  So we rely upon nobody altering the ->index
+                         * of this (pinned-by-us) page.
+                         */
+                        index = page->index;
+                        if (index > next)
+                                next = index;
                         next++;
+                        if (lock_failed)
+                                continue;
+
                         if (PageDirty(page) || PageWriteback(page))
                                 goto unlock;
                         if (page_mapped(page))