1 files changed, 7 insertions, 4 deletions

diff --git a/mm/vmscan.c b/mm/vmscan.c
index eceac9f9032f..9a29901ad3b3 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -191,7 +191,7 @@ unsigned long shrink_slab(unsigned long scanned, gfp_t gfp_mask,
                 shrinker->nr += delta;
                 if (shrinker->nr < 0) {
                         printk(KERN_ERR "%s: nr=%ld\n",
-                                        __FUNCTION__, shrinker->nr);
+                                        __func__, shrinker->nr);
                         shrinker->nr = max_pass;
                 }
 
@@ -339,7 +339,7 @@ static pageout_t pageout(struct page *page, struct address_space *mapping,
                 if (PagePrivate(page)) {
                         if (try_to_free_buffers(page)) {
                                 ClearPageDirty(page);
-                                printk("%s: orphaned page\n", __FUNCTION__);
+                                printk("%s: orphaned page\n", __func__);
                                 return PAGE_CLEAN;
                         }
                 }
@@ -1299,6 +1299,9 @@ static unsigned long shrink_zones(int priority, struct zonelist *zonelist,
  * hope that some of these pages can be written.  But if the allocating task
  * holds filesystem locks which prevent writeout this might not work, and the
  * allocation attempt will fail.
+ *
+ * returns:     0, if no pages reclaimed
+ *              else, the number of pages reclaimed
  */
 static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
                                         struct scan_control *sc)
@@ -1347,7 +1350,7 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
                 }
                 total_scanned += sc->nr_scanned;
                 if (nr_reclaimed >= sc->swap_cluster_max) {
-                        ret = 1;
+                        ret = nr_reclaimed;
                         goto out;
                 }
 
@@ -1370,7 +1373,7 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
         }
         /* top priority shrink_caches still had more to do? don't OOM, then */
         if (!sc->all_unreclaimable && scan_global_lru(sc))
-                ret = 1;
+                ret = nr_reclaimed;
 out:
         /*
          * Now that we've scanned all the zones at this priority level, note