From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Thu, 27 May 2010 23:54:23 +0000 (-0700)
Subject: Revert fix-clock-wrap fixed upstream
X-Git-Tag: zfs-0.5.0~38^2^2~1^2^2~43^2^2^2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=db069704ed117a1d1b1e740d88b46cc7f0cdd986;p=zfs

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.
---

diff --git a/module/zfs/arc.c b/module/zfs/arc.c
index 94fd0c1e5..d5e5aa544 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;
 		}