Signed-off-by: Matt Mackall <mpm@selenic.com>

Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/proc/task_mmu.c |   57 +++++++++++++++++++++++++++----------------
 1 file changed, 37 insertions(+), 20 deletions(-)

diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 922e19f79b6382ba98eb7ca490c56c5db84990bb..17d3bcd82b1d634fa5cbbeaf2ada0910f3327aad 100644 (file)
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -236,8 +236,8 @@ static int show_map(struct seq_file *m, void *v)
        return show_map_internal(m, v, NULL);
 }
 
-static void smaps_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,
-                           void *private)
+static int smaps_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,
+                          void *private)
 {
        struct mem_size_stats *mss = private;
        struct vm_area_struct *vma = mss->vma;
@@ -274,10 +274,11 @@ static void smaps_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,
        }
        pte_unmap_unlock(pte - 1, ptl);
        cond_resched();
+       return 0;
 }
 
-static void clear_refs_pte_range(pmd_t *pmd, unsigned long addr,
-                                unsigned long end, void *private)
+static int clear_refs_pte_range(pmd_t *pmd, unsigned long addr,
+                               unsigned long end, void *private)
 {
        struct vm_area_struct *vma = private;
        pte_t *pte, ptent;
@@ -300,40 +301,51 @@ static void clear_refs_pte_range(pmd_t *pmd, unsigned long addr,
        }
        pte_unmap_unlock(pte - 1, ptl);
        cond_resched();
+       return 0;
 }
 
-static void walk_pmd_range(pud_t *pud, unsigned long addr, unsigned long end,
-                          void (*action)(pmd_t *, unsigned long,
-                                         unsigned long, void *),
-                          void *private)
+static int walk_pmd_range(pud_t *pud, unsigned long addr, unsigned long end,
+                         int (*action)(pmd_t *, unsigned long,
+                                       unsigned long, void *),
+                         void *private)
 {
        pmd_t *pmd;
        unsigned long next;
+       int err;
 
        for (pmd = pmd_offset(pud, addr); addr != end;
             pmd++, addr = next) {
                next = pmd_addr_end(addr, end);
                if (pmd_none_or_clear_bad(pmd))
                        continue;
-               action(pmd, addr, next, private);
+               err = action(pmd, addr, next, private);
+               if (err)
+                       return err;
        }
+
+       return 0;
 }
 
-static void walk_pud_range(pgd_t *pgd, unsigned long addr, unsigned long end,
-                          void (*action)(pmd_t *, unsigned long,
-                                         unsigned long, void *),
-                          void *private)
+static int walk_pud_range(pgd_t *pgd, unsigned long addr, unsigned long end,
+                         int (*action)(pmd_t *, unsigned long,
+                                       unsigned long, void *),
+                         void *private)
 {
        pud_t *pud;
        unsigned long next;
+       int err;
 
        for (pud = pud_offset(pgd, addr); addr != end;
             pud++, addr = next) {
                next = pud_addr_end(addr, end);
                if (pud_none_or_clear_bad(pud))
                        continue;
-               walk_pmd_range(pud, addr, next, action, private);
+               err = walk_pmd_range(pud, addr, next, action, private);
+               if (err)
+                       return err;
        }
+
+       return 0;
 }
 
 /*
@@ -347,22 +359,27 @@ static void walk_pud_range(pgd_t *pgd, unsigned long addr, unsigned long end,
  * Recursively walk the page table for the memory area in a VMA, calling
  * a callback for every bottom-level (PTE) page table.
  */
-static void walk_page_range(struct mm_struct *mm,
-                           unsigned long addr, unsigned long end,
-                           void (*action)(pmd_t *, unsigned long,
-                                          unsigned long, void *),
-                           void *private)
+static int walk_page_range(struct mm_struct *mm,
+                          unsigned long addr, unsigned long end,
+                          int (*action)(pmd_t *, unsigned long,
+                                        unsigned long, void *),
+                          void *private)
 {
        pgd_t *pgd;
        unsigned long next;
+       int err;
 
        for (pgd = pgd_offset(mm, addr); addr != end;
             pgd++, addr = next) {
                next = pgd_addr_end(addr, end);
                if (pgd_none_or_clear_bad(pgd))
                        continue;
-               walk_pud_range(pgd, addr, next, action, private);
+               err = walk_pud_range(pgd, addr, next, action, private);
+               if (err)
+                       return err;
        }
+
+       return 0;
 }
 
 static int show_smap(struct seq_file *m, void *v)