X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Farc.c;h=eb5304a82a8cfb592758fcb585ef78ef87c8a77d;hb=da88a7fbe8876437c25f1006f91ca5595659b8d2;hp=f1f972b86ddea02861d2b3d8035d3ec70d3023c4;hpb=c409e4647f221ab724a0bd10c480ac95447203c3;p=zfs.git

diff --git a/module/zfs/arc.c b/module/zfs/arc.c
index f1f972b..eb5304a 100644
--- a/module/zfs/arc.c
+++ b/module/zfs/arc.c
@@ -2196,15 +2196,20 @@ SPL_SHRINKER_CALLBACK_PROTO(arc_shrinker_func, cb, nr_to_scan, gfp_mask)
 	arc_reclaim_strategy_t strategy;
 	int arc_reclaim;
 
-	/* Not allowed to perform filesystem reclaim */
-	if (!(gfp_mask & __GFP_FS))
-		return (-1);
-
 	/* Return number of reclaimable pages based on arc_shrink_shift */
-	arc_reclaim = btop((arc_size - arc_c_min)) >> arc_shrink_shift;
+	arc_reclaim = MAX(btop(((int64_t)arc_size - (int64_t)arc_c_min))
+	    >> arc_shrink_shift, 0);
 	if (nr_to_scan == 0)
 		return (arc_reclaim);
 
+	/* Prevent reclaim below arc_c_min */
+	if (arc_reclaim <= 0)
+		return (-1);
+
+	/* Not allowed to perform filesystem reclaim */
+	if (!(gfp_mask & __GFP_FS))
+		return (-1);
+
 	/* Reclaim in progress */
 	if (mutex_tryenter(&arc_reclaim_thr_lock) == 0)
 		return (-1);
@@ -2218,7 +2223,8 @@ SPL_SHRINKER_CALLBACK_PROTO(arc_shrinker_func, cb, nr_to_scan, gfp_mask)
 	}
 
 	arc_kmem_reap_now(strategy);
-	arc_reclaim = btop((arc_size - arc_c_min)) >> arc_shrink_shift;
+	arc_reclaim = MAX(btop(((int64_t)arc_size - (int64_t)arc_c_min))
+	    >> arc_shrink_shift, 0);
 	mutex_exit(&arc_reclaim_thr_lock);
 
 	return (arc_reclaim);