diff options
| author |   peter <peter@openbsd.org> | 1999-07-30 14:45:31 +0000 |
|---|---|---|
| committer | peter <peter@openbsd.org> | 1999-07-30 14:45:31 +0000 |
| commit | 16c3d6c44805f17bcf201fdae3a0c3b9f321ce72 (patch) | |
| tree | e0cb70b347563c6decb963b06643841fb106face /sys/dev/raidframe/rf_diskqueue.c | |
| parent | rename rl2->rln for sanity (diff) | |
| download | wireguard-openbsd-16c3d6c44805f17bcf201fdae3a0c3b9f321ce72.tar.xz wireguard-openbsd-16c3d6c44805f17bcf201fdae3a0c3b9f321ce72.zip | |
Update RAIDframe from NetBSD-current as of 1999/07/26.
Please note that you *must* follow the upgrade instructions at
http://www.cs.usask.ca/staff/oster/clabel_upgrade.html
before installing the new raidctl and new kernel using this code.
Diffstat (limited to 'sys/dev/raidframe/rf_diskqueue.c')
| -rw-r--r-- | sys/dev/raidframe/rf_diskqueue.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/sys/dev/raidframe/rf_diskqueue.c b/sys/dev/raidframe/rf_diskqueue.c index 14bccb06ca2..d050089d166 100644 --- a/sys/dev/raidframe/rf_diskqueue.c +++ b/sys/dev/raidframe/rf_diskqueue.c @@ -1,5 +1,5 @@ -/* $OpenBSD: rf_diskqueue.c,v 1.2 1999/02/16 00:02:39 niklas Exp $ */ -/* $NetBSD: rf_diskqueue.c,v 1.6 1999/02/05 00:06:09 oster Exp $ */ +/* $OpenBSD: rf_diskqueue.c,v 1.3 1999/07/30 14:45:32 peter Exp $ */ +/* $NetBSD: rf_diskqueue.c,v 1.7 1999/06/04 01:51:00 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -182,7 +182,12 @@ clean_dqd(dqd) free(dqd->bp, M_RAIDFRAME); } /* configures a single disk queue */ -static int +int config_disk_queue(RF_Raid_t *, RF_DiskQueue_t *, RF_RowCol_t, + RF_RowCol_t, RF_DiskQueueSW_t *, + RF_SectorCount_t, dev_t, int, + RF_ShutdownList_t **, + RF_AllocListElem_t *); +int config_disk_queue( RF_Raid_t * raidPtr, RF_DiskQueue_t * diskqueue, @@ -286,7 +291,10 @@ rf_ConfigureDiskQueues( } raidPtr->Queues = diskQueues; for (r = 0; r < raidPtr->numRow; r++) { - RF_CallocAndAdd(diskQueues[r], raidPtr->numCol + ((r == 0) ? raidPtr->numSpare : 0), sizeof(RF_DiskQueue_t), (RF_DiskQueue_t *), raidPtr->cleanupList); + RF_CallocAndAdd(diskQueues[r], raidPtr->numCol + + ((r == 0) ? RF_MAXSPARE : 0), + sizeof(RF_DiskQueue_t), (RF_DiskQueue_t *), + raidPtr->cleanupList); if (diskQueues[r] == NULL) return (ENOMEM); for (c = 0; c < raidPtr->numCol; c++) { |