]> granicus.if.org Git - zfs/commitdiff
Revert fix-clock-wrap fixed upstream
authorBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 27 May 2010 23:54:23 +0000 (16:54 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Thu, 27 May 2010 23:54:23 +0000 (16:54 -0700)
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

index 94fd0c1e5d0e0634c1934f49f29627ed13607955..d5e5aa544bfd09112f53a37e694208a1b9eb70cd 100644 (file)
@@ -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;
                }