| pst-raid.c (111979) | pst-raid.c (112946) |
|---|---|
| 1/*- 2 * Copyright (c) 2001,2002 S�ren Schmidt <sos@FreeBSD.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 11 unchanged lines hidden (view full) --- 20 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 * | 1/*- 2 * Copyright (c) 2001,2002 S�ren Schmidt <sos@FreeBSD.org> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 11 unchanged lines hidden (view full) --- 20 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 * |
| 28 * $FreeBSD: head/sys/dev/pst/pst-raid.c 111979 2003-03-08 08:01:31Z phk $ | 28 * $FreeBSD: head/sys/dev/pst/pst-raid.c 112946 2003-04-01 15:06:26Z phk $ |
| 29 */ 30 31#include <sys/param.h> 32#include <sys/systm.h> 33#include <sys/kernel.h> 34#include <sys/module.h> 35#include <sys/bus.h> 36#include <sys/bio.h> 37#include <sys/conf.h> | 29 */ 30 31#include <sys/param.h> 32#include <sys/systm.h> 33#include <sys/kernel.h> 34#include <sys/module.h> 35#include <sys/bus.h> 36#include <sys/bio.h> 37#include <sys/conf.h> |
| 38#include <sys/disk.h> | |
| 39#include <sys/eventhandler.h> 40#include <sys/malloc.h> 41#include <sys/lock.h> 42#include <sys/mutex.h> 43#include <vm/vm.h> 44#include <vm/pmap.h> 45#include <machine/stdarg.h> 46#include <machine/resource.h> 47#include <machine/bus.h> 48#include <sys/rman.h> 49#include <pci/pcivar.h> 50#include <pci/pcireg.h> | 38#include <sys/eventhandler.h> 39#include <sys/malloc.h> 40#include <sys/lock.h> 41#include <sys/mutex.h> 42#include <vm/vm.h> 43#include <vm/pmap.h> 44#include <machine/stdarg.h> 45#include <machine/resource.h> 46#include <machine/bus.h> 47#include <sys/rman.h> 48#include <pci/pcivar.h> 49#include <pci/pcireg.h> |
| 50#include <geom/geom_disk.h> |
|
| 51 52#include "dev/pst/pst-iop.h" 53 54struct pst_softc { 55 struct iop_softc *iop; 56 struct i2o_lct_entry *lct; 57 struct i2o_bsa_device *info; 58 struct disk disk; --- 136 unchanged lines hidden (view full) --- 195} 196 197static void 198pststrategy(struct bio *bp) 199{ 200 struct pst_softc *psc = bp->bio_disk->d_drv1; 201 202 mtx_lock(&psc->mtx); | 51 52#include "dev/pst/pst-iop.h" 53 54struct pst_softc { 55 struct iop_softc *iop; 56 struct i2o_lct_entry *lct; 57 struct i2o_bsa_device *info; 58 struct disk disk; --- 136 unchanged lines hidden (view full) --- 195} 196 197static void 198pststrategy(struct bio *bp) 199{ 200 struct pst_softc *psc = bp->bio_disk->d_drv1; 201 202 mtx_lock(&psc->mtx); |
| 203 bioqdisksort(&psc->queue, bp); | 203 bioq_disksort(&psc->queue, bp); |
| 204 pst_start(psc); 205 mtx_unlock(&psc->mtx); 206} 207 208static void 209pst_start(struct pst_softc *psc) 210{ 211 struct pst_request *request; --- 164 unchanged lines hidden --- | 204 pst_start(psc); 205 mtx_unlock(&psc->mtx); 206} 207 208static void 209pst_start(struct pst_softc *psc) 210{ 211 struct pst_request *request; --- 164 unchanged lines hidden --- |