Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/kern/subr_pool.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/subr_pool.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.158.2.5 retrieving revision 1.182.4.1 diff -u -p -r1.158.2.5 -r1.182.4.1 --- src/sys/kern/subr_pool.c 2010/08/11 22:54:42 1.158.2.5 +++ src/sys/kern/subr_pool.c 2010/05/30 05:17:58 1.182.4.1 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_pool.c,v 1.158.2.5 2010/08/11 22:54:42 yamt Exp $ */ +/* $NetBSD: subr_pool.c,v 1.182.4.1 2010/05/30 05:17:58 rmind Exp $ */ /*- * Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010 @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.158.2.5 2010/08/11 22:54:42 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.182.4.1 2010/05/30 05:17:58 rmind Exp $"); #include "opt_ddb.h" #include "opt_pool.h" @@ -1745,13 +1745,12 @@ pool_drain_start(struct pool **ppp, uint } } -bool +void pool_drain_end(struct pool *pp, uint64_t where) { - bool reclaimed; if (pp == NULL) - return false; + return; KASSERT(pp->pr_refcnt > 0); @@ -1760,15 +1759,13 @@ pool_drain_end(struct pool *pp, uint64_t xc_wait(where); /* Drain the cache (if any) and pool.. */ - reclaimed = pool_reclaim(pp); + pool_reclaim(pp); /* Finally, unlock the pool. */ mutex_enter(&pool_head_lock); pp->pr_refcnt--; cv_broadcast(&pool_busy); mutex_exit(&pool_head_lock); - - return reclaimed; } /*