aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Lespinasse <walken@google.com>2010-11-02 16:05:18 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-02 17:02:31 -0400
commitd88c0922fa0e2c021a028b310a641126c6d4b7dc (patch)
treef6e74b391a526c845cbe44bbc5e6585256a4d097
parenteb8abb927ae2fd1730e24ea94cd9527f3c086292 (diff)
Release page reference during page fault retry
This slipped by when unifying the filemap and swap versions of lock_page_or_retry()... Signed-off-by: Michel Lespinasse <walken@google.com> Acked-by: Rik van Riel <riel@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/filemap.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/filemap.c b/mm/filemap.c
index 75572b5f2374..61ba5e405791 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1563,8 +1563,10 @@ retry_find:
1563 goto no_cached_page; 1563 goto no_cached_page;
1564 } 1564 }
1565 1565
1566 if (!lock_page_or_retry(page, vma->vm_mm, vmf->flags)) 1566 if (!lock_page_or_retry(page, vma->vm_mm, vmf->flags)) {
1567 page_cache_release(page);
1567 return ret | VM_FAULT_RETRY; 1568 return ret | VM_FAULT_RETRY;
1569 }
1568 1570
1569 /* Did it get truncated? */ 1571 /* Did it get truncated? */
1570 if (unlikely(page->mapping != mapping)) { 1572 if (unlikely(page->mapping != mapping)) {