From 1e3cb67b53fba067fd7bf9a13d21b53de4626dc1 Mon Sep 17 00:00:00 2001 From: Prakash Surya Date: Mon, 23 Dec 2013 11:34:20 -0800 Subject: [PATCH] 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 Signed-off-by: Brian Behlendorf Issue #2110 --- module/zfs/arc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/module/zfs/arc.c b/module/zfs/arc.c index 68496783d65b..ad2e8a92d42e 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);