Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk

This commit is contained in:
Brian Behlendorf 2010-05-27 17:02:36 -07:00
commit fb7a18aa41
1 changed files with 3 additions and 3 deletions

View File

@ -1999,7 +1999,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;
@ -2022,12 +2022,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;
}