Check for "udevadm settle" vs "udevsettle"

[zfs.git] / module / zfs / arc.c

diff --git a/module/zfs/arc.c b/module/zfs/arc.c
index f1f972b..7f1f747 100644 (file)
--- a/module/zfs/arc.c
+++ b/module/zfs/arc.c
@@ -2191,20 +2191,26 @@ arc_reclaim_thread(void)
  * direct reclaim will be trigger.  In direct reclaim a more aggressive
  * strategy is used, data is evicted from the ARC and free slabs reaped.
  */
-SPL_SHRINKER_CALLBACK_PROTO(arc_shrinker_func, cb, nr_to_scan, gfp_mask)
+static int
+__arc_shrinker_func(struct shrinker *shrink, struct shrink_control *sc)
 {
        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;
-       if (nr_to_scan == 0)
+       arc_reclaim = MAX(btop(((int64_t)arc_size - (int64_t)arc_c_min))
+           >> arc_shrink_shift, 0);
+       if (sc->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 (!(sc->gfp_mask & __GFP_FS))
+               return (-1);
+
        /* Reclaim in progress */
        if (mutex_tryenter(&arc_reclaim_thr_lock) == 0)
                return (-1);
@@ -2218,11 +2224,13 @@ 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);
 }
+SPL_SHRINKER_CALLBACK_WRAPPER(arc_shrinker_func);
 
 SPL_SHRINKER_DECLARE(arc_shrinker, arc_shrinker_func, DEFAULT_SEEKS);
 #endif /* _KERNEL */