Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

We only need a single component buffer pool.

Browse Source
This commit is contained in:
thorpej 2002-01-09 04:21:43 +00:00
parent 229efaff69
commit bd4e2862b0
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/dev/raidframe/rf_netbsdkintf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rf_netbsdkintf.c,v 1.115 2001/12/16 22:57:32 oster Exp $ */ /* $NetBSD: rf_netbsdkintf.c,v 1.116 2002/01/09 04:21:43 thorpej Exp $ */
/*- /*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved. * All rights reserved.
@ -114,7 +114,7 @@
***********************************************************/ ***********************************************************/
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.115 2001/12/16 22:57:32 oster Exp $"); __KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.116 2002/01/09 04:21:43 thorpej Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/errno.h> #include <sys/errno.h>
@ -203,9 +203,11 @@ struct raidbuf {
RF_DiskQueueData_t *req;/* the request that this was part of.. */ RF_DiskQueueData_t *req;/* the request that this was part of.. */
}; };
/* component buffer pool */
struct pool raidframe_cbufpool;
#define RAIDGETBUF(rs) pool_get(&(rs)->sc_cbufpool, PR_NOWAIT) #define RAIDGETBUF(rs) pool_get(&raidframe_cbufpool, PR_NOWAIT)
#define RAIDPUTBUF(rs, cbp) pool_put(&(rs)->sc_cbufpool, cbp) #define RAIDPUTBUF(rs, cbp) pool_put(&raidframe_cbufpool, cbp)
/* XXX Not sure if the following should be replacing the raidPtrs above, /* XXX Not sure if the following should be replacing the raidPtrs above,
or if it should be used in conjunction with that... or if it should be used in conjunction with that...
@ -217,7 +219,6 @@ struct raid_softc {
size_t sc_size; /* size of the raid device */ size_t sc_size; /* size of the raid device */
char sc_xname[20]; /* XXX external name */ char sc_xname[20]; /* XXX external name */
struct disk sc_dkdev; /* generic disk device info */ struct disk sc_dkdev; /* generic disk device info */
struct pool sc_cbufpool; /* component buffer pool */
struct buf_queue buf_queue; /* used for the device queue */ struct buf_queue buf_queue; /* used for the device queue */
}; };
/* sc_flags */ /* sc_flags */
@ -325,7 +326,11 @@ raidattach(num)
if (raidPtrs == NULL) { if (raidPtrs == NULL) {
panic("raidPtrs is NULL!!\n"); panic("raidPtrs is NULL!!\n");
} }
/* Initialize the component buffer pool. */
pool_init(&raidframe_cbufpool, sizeof(struct raidbuf), 0,
0, 0, "raidpl", 0, NULL, NULL, M_RAIDFRAME);
rc = rf_mutex_init(&rf_sparet_wait_mutex); rc = rf_mutex_init(&rf_sparet_wait_mutex);
if (rc) { if (rc) {
RF_PANIC(); RF_PANIC();
@ -640,7 +645,6 @@ raidclose(dev, flags, fmt, p)
/* last one, and we're going down, so /* last one, and we're going down, so
lights out for this RAID set too. */ lights out for this RAID set too. */
error = rf_Shutdown(raidPtrs[unit]); error = rf_Shutdown(raidPtrs[unit]);
pool_destroy(&rs->sc_cbufpool);
/* It's no longer initialized... */ /* It's no longer initialized... */
rs->sc_flags &= ~RAIDF_INITED; rs->sc_flags &= ~RAIDF_INITED;
@ -974,8 +978,6 @@ raidioctl(dev, cmd, data, flag, p)
retcode = rf_Shutdown(raidPtr); retcode = rf_Shutdown(raidPtr);
pool_destroy(&rs->sc_cbufpool);
/* It's no longer initialized... */ /* It's no longer initialized... */
rs->sc_flags &= ~RAIDF_INITED; rs->sc_flags &= ~RAIDF_INITED;
@ -1566,9 +1568,6 @@ raidinit(raidPtr)
unit = raidPtr->raidid; unit = raidPtr->raidid;
rs = &raid_softc[unit]; rs = &raid_softc[unit];
pool_init(&rs->sc_cbufpool, sizeof(struct raidbuf), 0,
0, 0, "raidpl", 0, NULL, NULL, M_RAIDFRAME);
/* XXX should check return code first... */ /* XXX should check return code first... */
rs->sc_flags |= RAIDF_INITED; rs->sc_flags |= RAIDF_INITED;