From c195cf3fd5d8b0218f330de8e0de73eb3ee3e4c5 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 20 Nov 2008 12:51:54 -0800 Subject: [PATCH] Add fix-clock-wrap branch --- .topdeps | 1 + .topmsg | 8 ++++++++ zfs/lib/libzpool/arc.c | 6 +++--- 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 .topdeps create mode 100644 .topmsg diff --git a/.topdeps b/.topdeps new file mode 100644 index 0000000000..1f7391f92b --- /dev/null +++ b/.topdeps @@ -0,0 +1 @@ +master diff --git a/.topmsg b/.topmsg new file mode 100644 index 0000000000..55b2a3f8f3 --- /dev/null +++ b/.topmsg @@ -0,0 +1,8 @@ +From: Brian Behlendorf +Subject: [PATCH] fix clock wrap + +Fix lbolt clock wrap. + +Signed-off-by: Brian Behlendorf + +--- diff --git a/zfs/lib/libzpool/arc.c b/zfs/lib/libzpool/arc.c index 8d091b7cea..8b574d85a7 100644 --- 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; }