Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-user-util' into linux-user-util

This commit is contained in:
Brian Behlendorf 2010-05-27 17:04:45 -07:00
parent 05a2a919c8 2fbe461b55
commit a9ea79346f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
module/zfs/arc.c
View File

@ -1999,7 +1999,7 @@ arc_kmem_reap_now(arc_reclaim_strategy_t strat)
static void static void
arc_reclaim_thread(void) arc_reclaim_thread(void)
{ {
int64_t growtime = 0; clock_t growtime = 0;
arc_reclaim_strategy_t last_reclaim = ARC_RECLAIM_CONS; arc_reclaim_strategy_t last_reclaim = ARC_RECLAIM_CONS;
callb_cpr_t cpr; callb_cpr_t cpr;
@ -2022,12 +2022,12 @@ arc_reclaim_thread(void)
} }
/* reset the growth delay for every reclaim */ /* 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_kmem_reap_now(last_reclaim);
arc_warm = B_TRUE; arc_warm = B_TRUE;
} else if (arc_no_grow && lbolt64 >= growtime) { } else if (arc_no_grow && lbolt >= growtime) {
arc_no_grow = FALSE; arc_no_grow = FALSE;
} }