Add fix-clock-wrap branch

diff --git a/.topdeps b/.topdeps
new file mode 100644 (file)
index 0000000..1f7391f
--- /dev/null
+++ b/.topdeps
@@ -0,0 +1 @@
+master

diff --git a/.topmsg b/.topmsg
new file mode 100644 (file)
index 0000000..55b2a3f
--- /dev/null
+++ b/.topmsg
@@ -0,0 +1,8 @@
+From: Brian Behlendorf <behlendorf1@llnl.gov>
+Subject: [PATCH] fix clock wrap
+
+Fix lbolt clock wrap.
+
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
+
+---

diff --git a/zfs/lib/libzpool/arc.c b/zfs/lib/libzpool/arc.c
index 8d091b7ceabd982a87b04322b839cd89c97e2cc8..8b574d85a76384e8371474c90cc01ceee7afa572 100644 (file)
--- a/zfs/lib/libzpool/arc.c
+++ b/zfs/lib/libzpool/arc.c
@@ -1858,7 +1858,7 @@ arc_kmem_reap_now(arc_reclaim_strategy_t strat)
 static void
 arc_reclaim_thread(void)
 {
-       clock_t                 growtime = 0;
+       int64_t                 growtime = 0;
        arc_reclaim_strategy_t  last_reclaim = ARC_RECLAIM_CONS;
        callb_cpr_t             cpr;
 
@@ -1881,11 +1881,11 @@ arc_reclaim_thread(void)
                        }
 
                        /* reset the growth delay for every reclaim */
-                       growtime = lbolt + (arc_grow_retry * hz);
+                       growtime = lbolt64 + (arc_grow_retry * hz);
 
                        arc_kmem_reap_now(last_reclaim);
 
-               } else if (arc_no_grow && lbolt >= growtime) {
+               } else if (arc_no_grow && lbolt64 >= growtime) {
                        arc_no_grow = FALSE;
                }