[src/trunk]: src/sys/dev/raidframe Since the 5th arg of pool_init() wasn't ac...

[oster <oster%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/61fafb5b609b
branches:  trunk
changeset: 556604:61fafb5b609b
user:      oster <oster%NetBSD.org@localhost>
date:      Sun Dec 21 15:56:20 2003 +0000

description:
Since the 5th arg of pool_init() wasn't actually the number
of items with which to prime the pool, we now prime each
pool using pool_prime().

diffstat:

 sys/dev/raidframe/rf_callback.c |  6 ++++--
 sys/dev/raidframe/rf_psstatus.c |  7 ++++---
 sys/dev/raidframe/rf_reconmap.c |  5 +++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diffs (81 lines):

diff -r c4251cf4fdea -r 61fafb5b609b sys/dev/raidframe/rf_callback.c
--- a/sys/dev/raidframe/rf_callback.c   Sun Dec 21 15:32:59 2003 +0000
+++ b/sys/dev/raidframe/rf_callback.c   Sun Dec 21 15:56:20 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_callback.c,v 1.9 2003/12/21 07:53:59 simonb Exp $   */
+/*     $NetBSD: rf_callback.c,v 1.10 2003/12/21 15:56:20 oster Exp $   */
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -34,7 +34,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_callback.c,v 1.9 2003/12/21 07:53:59 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_callback.c,v 1.10 2003/12/21 15:56:20 oster Exp $");
 
 #include <dev/raidframe/raidframevar.h>
 #include <sys/pool.h>
@@ -69,6 +69,8 @@
        pool_init(&rf_callback_pool, sizeof(RF_CallbackDesc_t), 0, 0, 0,
                  "rf_callbackpl", NULL);
        pool_sethiwat(&rf_callback_pool, RF_MAX_FREE_CALLBACK);
+       pool_prime(&rf_callback_pool, RF_CALLBACK_INITIAL);
+
        rc = rf_ShutdownCreate(listp, rf_ShutdownCallback, NULL);
        if (rc) {
                rf_print_unable_to_add_shutdown(__FILE__,__LINE__, rc);
diff -r c4251cf4fdea -r 61fafb5b609b sys/dev/raidframe/rf_psstatus.c
--- a/sys/dev/raidframe/rf_psstatus.c   Sun Dec 21 15:32:59 2003 +0000
+++ b/sys/dev/raidframe/rf_psstatus.c   Sun Dec 21 15:56:20 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_psstatus.c,v 1.13 2003/12/21 07:53:59 simonb Exp $  */
+/*     $NetBSD: rf_psstatus.c,v 1.14 2003/12/21 15:56:20 oster Exp $   */
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -37,7 +37,7 @@
  *****************************************************************************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_psstatus.c,v 1.13 2003/12/21 07:53:59 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_psstatus.c,v 1.14 2003/12/21 15:56:20 oster Exp $");
 
 #include <dev/raidframe/raidframevar.h>
 
@@ -100,7 +100,8 @@
        }
        pool_sethiwat(&raidPtr->pss_pool, RF_MAX_FREE_PSS);
        pool_sethiwat(&raidPtr->pss_issued_pool, RF_MAX_FREE_PSS);
-
+       pool_prime(&raidPtr->pss_pool, RF_PSS_INITIAL);
+       pool_prime(&raidPtr->pss_issued_pool, RF_PSS_INITIAL);
        return (0);
 }
 /*****************************************************************************************
diff -r c4251cf4fdea -r 61fafb5b609b sys/dev/raidframe/rf_reconmap.c
--- a/sys/dev/raidframe/rf_reconmap.c   Sun Dec 21 15:32:59 2003 +0000
+++ b/sys/dev/raidframe/rf_reconmap.c   Sun Dec 21 15:56:20 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_reconmap.c,v 1.16 2003/12/21 07:53:59 simonb Exp $  */
+/*     $NetBSD: rf_reconmap.c,v 1.17 2003/12/21 15:56:20 oster Exp $   */
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -34,7 +34,7 @@
  *************************************************************************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_reconmap.c,v 1.16 2003/12/21 07:53:59 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_reconmap.c,v 1.17 2003/12/21 15:56:20 oster Exp $");
 
 #include "rf_raid.h"
 #include <sys/time.h>
@@ -111,6 +111,7 @@
        
        pool_init(&p->elem_pool, sizeof(RF_ReconMapListElem_t), 0,
            0, 0, "raidreconpl", NULL);
+       pool_prime(&p->elem_pool, RF_NUM_RECON_POOL_ELEM);
 
        rc = rf_mutex_init(&p->mutex);
        if (rc) {