From: Prakash Surya <surya1@llnl.gov>
Date: Mon, 23 Dec 2013 19:34:20 +0000 (-0800)
Subject: Revert "Return -1 from arc_shrinker_func()"
X-Git-Tag: zfs-0.7.12~1847^2~5
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=1e3cb67b53fba067fd7bf9a13d21b53de4626dc1;p=mirror_zfs.git

Revert "Return -1 from arc_shrinker_func()"

This reverts commit c11a12bc3b2e5ee9a6bd74e26f1a396b6025fbd4.

Out of memory events were fixed by reverting this patch.

Signed-off-by: Prakash Surya <surya1@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #2110
---

diff --git a/module/zfs/arc.c b/module/zfs/arc.c
index 68496783d..ad2e8a92d 100644
--- a/module/zfs/arc.c
+++ b/module/zfs/arc.c
@@ -2583,8 +2583,10 @@ __arc_shrinker_func(struct shrinker *shrink, struct shrink_control *sc)
 	 */
 	if (pages > 0) {
 		arc_kmem_reap_now(ARC_RECLAIM_AGGR, ptob(sc->nr_to_scan));
+		pages = btop(arc_evictable_memory());
 	} else {
 		arc_kmem_reap_now(ARC_RECLAIM_CONS, ptob(sc->nr_to_scan));
+		pages = -1;
 	}
 
 	/*
@@ -2604,7 +2606,7 @@ __arc_shrinker_func(struct shrinker *shrink, struct shrink_control *sc)
 
 	mutex_exit(&arc_reclaim_thr_lock);
 
-	return (-1);
+	return (pages);
 }
 SPL_SHRINKER_CALLBACK_WRAPPER(arc_shrinker_func);