From db069704ed117a1d1b1e740d88b46cc7f0cdd986 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 27 May 2010 16:54:23 -0700 Subject: [PATCH] Revert fix-clock-wrap fixed upstream This was more or less fixed upstream. Instead of directly accessing lbolt they now use ddi_get_lbolt() which we can have do the right thing is the SPL so we don't need to carry this patch. --- module/zfs/arc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/zfs/arc.c b/module/zfs/arc.c index 94fd0c1e5d..d5e5aa544b 100644 --- a/module/zfs/arc.c +++ b/module/zfs/arc.c @@ -1994,7 +1994,7 @@ arc_kmem_reap_now(arc_reclaim_strategy_t strat) static void arc_reclaim_thread(void) { - int64_t growtime = 0; + clock_t growtime = 0; arc_reclaim_strategy_t last_reclaim = ARC_RECLAIM_CONS; callb_cpr_t cpr; @@ -2017,12 +2017,12 @@ arc_reclaim_thread(void) } /* reset the growth delay for every reclaim */ - growtime = lbolt64 + (arc_grow_retry * hz); + growtime = lbolt + (arc_grow_retry * hz); arc_kmem_reap_now(last_reclaim); arc_warm = B_TRUE; - } else if (arc_no_grow && lbolt64 >= growtime) { + } else if (arc_no_grow && lbolt >= growtime) { arc_no_grow = FALSE; }