summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe/rf_diskqueue.c
diff options
context:
space:
mode:
authorad <ad@NetBSD.org>2008-01-02 11:48:20 +0000
committerad <ad@NetBSD.org>2008-01-02 11:48:20 +0000
commit4a780c9ae2adec0bc218b3dea0fcec31165494ed (patch)
tree199a903df0335a6381eae4dd10bf5666da00fad9 /sys/dev/raidframe/rf_diskqueue.c
parenta41df3835967f15a459c3de3f85e8b82074e5b9d (diff)
Merge vmlocking2 to head.
Diffstat (limited to 'sys/dev/raidframe/rf_diskqueue.c')
-rw-r--r--sys/dev/raidframe/rf_diskqueue.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/sys/dev/raidframe/rf_diskqueue.c b/sys/dev/raidframe/rf_diskqueue.c
index 3a7a7cb16f2..5f557b039e5 100644
--- a/sys/dev/raidframe/rf_diskqueue.c
+++ b/sys/dev/raidframe/rf_diskqueue.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_diskqueue.c,v 1.49 2007/03/04 06:02:37 christos Exp $ */
+/* $NetBSD: rf_diskqueue.c,v 1.50 2008/01/02 11:48:38 ad Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -66,7 +66,7 @@
****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_diskqueue.c,v 1.49 2007/03/04 06:02:37 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_diskqueue.c,v 1.50 2008/01/02 11:48:38 ad Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -449,25 +449,19 @@ rf_CreateDiskQueueData(RF_IoType_t typ, RF_SectorNum_t ssect,
int waitflag)
{
RF_DiskQueueData_t *p;
- int s;
- s = splbio();
p = pool_get(&rf_pools.dqd, waitflag);
- splx(s);
if (p == NULL)
return (NULL);
memset(p, 0, sizeof(RF_DiskQueueData_t));
if (waitflag == PR_WAITOK) {
- p->bp = getiobuf();
+ p->bp = getiobuf(NULL, true);
} else {
- p->bp = getiobuf_nowait();
+ p->bp = getiobuf(NULL, false);
}
if (p->bp == NULL) {
- /* no memory for the buffer!?!? */
- s = splbio();
pool_put(&rf_pools.dqd, p);
- splx(s);
return (NULL);
}