diff options
| author | thorpej <thorpej@NetBSD.org> | 2003-02-25 20:35:31 +0000 |
|---|---|---|
| committer | thorpej <thorpej@NetBSD.org> | 2003-02-25 20:35:31 +0000 |
| commit | eb14e866760f574eec4780202b889ac3bbc49d89 (patch) | |
| tree | 7314d0576ed195cf1d15bb6231040e383da37f78 /sys/dev | |
| parent | cc005c66dbc79b15c3eb81d26efb64aa8cefbf9c (diff) | |
Add a new BUF_INIT() macro which initializes b_dep and b_interlock, and
use it. This fixes a few places where either b_dep or b_interlock were
not properly initialized.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ata/ata_raid.c | 5 | ||||
| -rw-r--r-- | sys/dev/ata/ld_ataraid.c | 4 | ||||
| -rw-r--r-- | sys/dev/ccd.c | 7 | ||||
| -rw-r--r-- | sys/dev/cgd.c | 7 | ||||
| -rw-r--r-- | sys/dev/isa/fd.c | 6 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_netbsdkintf.c | 8 | ||||
| -rw-r--r-- | sys/dev/scsipi/cd.c | 9 | ||||
| -rw-r--r-- | sys/dev/vnd.c | 7 |
8 files changed, 23 insertions, 30 deletions
diff --git a/sys/dev/ata/ata_raid.c b/sys/dev/ata/ata_raid.c index d9ba4896f3b..e13cfe93899 100644 --- a/sys/dev/ata/ata_raid.c +++ b/sys/dev/ata/ata_raid.c @@ -1,4 +1,4 @@ -/* $NetBSD: ata_raid.c,v 1.2 2003/02/05 21:38:40 pk Exp $ */ +/* $NetBSD: ata_raid.c,v 1.3 2003/02/25 20:35:35 thorpej Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -296,8 +296,7 @@ ata_raid_config_block_rw(struct vnode *vp, daddr_t blkno, void *buf, int error; bp = pool_get(&bufpool, PR_WAITOK); - simple_lock_init(&bp->b_interlock); - LIST_INIT(&bp->b_dep); + BUF_INIT(bp); bp->b_vp = vp; bp->b_dev = vp->v_rdev; diff --git a/sys/dev/ata/ld_ataraid.c b/sys/dev/ata/ld_ataraid.c index 2b77c1e15e8..0673f2e27dd 100644 --- a/sys/dev/ata/ld_ataraid.c +++ b/sys/dev/ata/ld_ataraid.c @@ -1,4 +1,4 @@ -/* $NetBSD: ld_ataraid.c,v 1.3 2003/01/29 16:50:37 thorpej Exp $ */ +/* $NetBSD: ld_ataraid.c,v 1.4 2003/02/25 20:35:35 thorpej Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -231,6 +231,7 @@ ld_ataraid_make_cbuf(struct ld_ataraid_softc *sc, struct buf *bp, cbp = CBUF_GET(); if (cbp == NULL) return (NULL); + BUF_INIT(&cbp->cb_buf); cbp->cb_buf.b_flags = bp->b_flags | B_CALL; cbp->cb_buf.b_iodone = sc->sc_iodone; cbp->cb_buf.b_proc = bp->b_proc; @@ -238,7 +239,6 @@ ld_ataraid_make_cbuf(struct ld_ataraid_softc *sc, struct buf *bp, cbp->cb_buf.b_dev = sc->sc_vnodes[comp]->v_rdev; cbp->cb_buf.b_blkno = bn + sc->sc_aai->aai_offset; cbp->cb_buf.b_data = addr; - LIST_INIT(&cbp->cb_buf.b_dep); cbp->cb_buf.b_bcount = bcount; /* Context for iodone */ diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c index 122fdc7ee1d..970df618a4e 100644 --- a/sys/dev/ccd.c +++ b/sys/dev/ccd.c @@ -1,4 +1,4 @@ -/* $NetBSD: ccd.c,v 1.82 2003/02/05 21:38:39 pk Exp $ */ +/* $NetBSD: ccd.c,v 1.83 2003/02/25 20:35:33 thorpej Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 1999 The NetBSD Foundation, Inc. @@ -90,7 +90,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.82 2003/02/05 21:38:39 pk Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.83 2003/02/25 20:35:33 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -802,7 +802,7 @@ ccdbuffer(cs, bp, bn, addr, bcount) cbp = CCD_GETBUF(); if (cbp == NULL) return (NULL); - simple_lock_init(&cbp->cb_buf.b_interlock); + BUF_INIT(&cbp->cb_buf); cbp->cb_buf.b_flags = bp->b_flags | B_CALL; cbp->cb_buf.b_iodone = ccdiodone; cbp->cb_buf.b_proc = bp->b_proc; @@ -810,7 +810,6 @@ ccdbuffer(cs, bp, bn, addr, bcount) cbp->cb_buf.b_blkno = cbn + cboff; cbp->cb_buf.b_data = addr; cbp->cb_buf.b_vp = ci->ci_vp; - LIST_INIT(&cbp->cb_buf.b_dep); if (cs->sc_ileave == 0) cbc = dbtob((u_int64_t)(ci->ci_size - cbn)); else diff --git a/sys/dev/cgd.c b/sys/dev/cgd.c index 0761fe568b0..b482fe0c46e 100644 --- a/sys/dev/cgd.c +++ b/sys/dev/cgd.c @@ -1,4 +1,4 @@ -/* $NetBSD: cgd.c,v 1.7 2003/02/05 21:38:40 pk Exp $ */ +/* $NetBSD: cgd.c,v 1.8 2003/02/25 20:35:34 thorpej Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.7 2003/02/05 21:38:40 pk Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.8 2003/02/25 20:35:34 thorpej Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -307,7 +307,7 @@ cgdstart(struct dk_softc *dksc, struct buf *bp) disk_unbusy(&dksc->sc_dkdev, 0, (bp->b_flags & B_READ)); return; } - simple_lock_init(&cbp->cb_buf.b_interlock); + BUF_INIT(&cbp->cb_buf); cbp->cb_buf.b_data = newaddr; cbp->cb_buf.b_flags = bp->b_flags | B_CALL; cbp->cb_buf.b_iodone = cgdiodone; @@ -315,7 +315,6 @@ cgdstart(struct dk_softc *dksc, struct buf *bp) cbp->cb_buf.b_dev = cs->sc_tdev; cbp->cb_buf.b_blkno = bn; cbp->cb_buf.b_vp = cs->sc_tvn; - LIST_INIT(&cbp->cb_buf.b_dep); cbp->cb_buf.b_bcount = bp->b_bcount; /* context for cgdiodone */ diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c index 16a49810f8c..db4beb9c2f3 100644 --- a/sys/dev/isa/fd.c +++ b/sys/dev/isa/fd.c @@ -1,4 +1,4 @@ -/* $NetBSD: fd.c,v 1.38 2003/02/05 22:14:01 pk Exp $ */ +/* $NetBSD: fd.c,v 1.39 2003/02/25 20:35:35 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -92,7 +92,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.38 2003/02/05 22:14:01 pk Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.39 2003/02/25 20:35:35 thorpej Exp $"); #include "rnd.h" #include "opt_ddb.h" @@ -1491,7 +1491,7 @@ fdformat(dev, finfo, p) return ENOBUFS; memset((void *)bp, 0, sizeof(struct buf)); - simple_lock_init(&bp->b_interlock); + BUF_INIT(bp); bp->b_flags = B_BUSY | B_PHYS | B_FORMAT; bp->b_proc = p; bp->b_dev = dev; diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c index aeae2b9712f..32e040631e3 100644 --- a/sys/dev/raidframe/rf_netbsdkintf.c +++ b/sys/dev/raidframe/rf_netbsdkintf.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_netbsdkintf.c,v 1.154 2003/02/05 21:38:40 pk Exp $ */ +/* $NetBSD: rf_netbsdkintf.c,v 1.155 2003/02/25 20:35:36 thorpej Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -111,7 +111,7 @@ ***********************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.154 2003/02/05 21:38:40 pk Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.155 2003/02/25 20:35:36 thorpej Exp $"); #include <sys/param.h> #include <sys/errno.h> @@ -1840,7 +1840,7 @@ rf_DispatchKernelIO(queue, req) bp->b_error = ENOMEM; return (ENOMEM); } - simple_lock_init(&raidbp->rf_buf.b_interlock); + BUF_INIT(&raidbp->rf_buf); /* * context for raidiodone @@ -1848,8 +1848,6 @@ rf_DispatchKernelIO(queue, req) raidbp->rf_obp = bp; raidbp->req = req; - LIST_INIT(&raidbp->rf_buf.b_dep); - switch (req->type) { case RF_IO_TYPE_NOP: /* used primarily to unlock a locked queue */ /* XXX need to do something extra here.. */ diff --git a/sys/dev/scsipi/cd.c b/sys/dev/scsipi/cd.c index deba12dc859..c52eb2b0553 100644 --- a/sys/dev/scsipi/cd.c +++ b/sys/dev/scsipi/cd.c @@ -1,4 +1,4 @@ -/* $NetBSD: cd.c,v 1.178 2003/02/05 21:38:41 pk Exp $ */ +/* $NetBSD: cd.c,v 1.179 2003/02/25 20:35:37 thorpej Exp $ */ /*- * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc. @@ -54,7 +54,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.178 2003/02/05 21:38:41 pk Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.179 2003/02/25 20:35:37 thorpej Exp $"); #include "rnd.h" @@ -647,7 +647,7 @@ cdstrategy(bp) } /* Set up the IOP to the bounce buffer. */ - simple_lock_init(&nbp->b_interlock); + BUF_INIT(nbp); nbp->b_error = 0; nbp->b_proc = bp->b_proc; nbp->b_vp = NULLVP; @@ -656,7 +656,6 @@ cdstrategy(bp) nbp->b_bufsize = count; nbp->b_data = bounce; - LIST_INIT(&nbp->b_dep); nbp->b_rawblkno = blkno; /* We need to do a read-modify-write operation */ @@ -889,6 +888,7 @@ cdbounce(bp) } /* Set up the IOP to the bounce buffer. */ + BUF_INIT(nbp); nbp->b_error = 0; nbp->b_proc = bp->b_proc; nbp->b_vp = NULLVP; @@ -897,7 +897,6 @@ cdbounce(bp) nbp->b_bufsize = bp->b_bufsize; nbp->b_data = bp->b_data; - LIST_INIT(&nbp->b_dep); nbp->b_rawblkno = bp->b_rawblkno; /* We need to do a read-modify-write operation */ diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c index 5c4577125bf..03c47928ec7 100644 --- a/sys/dev/vnd.c +++ b/sys/dev/vnd.c @@ -1,4 +1,4 @@ -/* $NetBSD: vnd.c,v 1.91 2003/02/05 21:38:39 pk Exp $ */ +/* $NetBSD: vnd.c,v 1.92 2003/02/25 20:35:34 thorpej Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. @@ -98,7 +98,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.91 2003/02/05 21:38:39 pk Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.92 2003/02/25 20:35:34 thorpej Exp $"); #if defined(_KERNEL_OPT) #include "fs_nfs.h" @@ -490,7 +490,7 @@ vndstrategy(bp) s = splbio(); nbp = VND_GETBUF(vnd); splx(s); - simple_lock_init(&nbp->vb_buf.b_interlock); + BUF_INIT(&nbp->vb_buf); nbp->vb_buf.b_flags = flags; nbp->vb_buf.b_bcount = sz; nbp->vb_buf.b_bufsize = round_page((ulong)addr + sz) @@ -501,7 +501,6 @@ vndstrategy(bp) nbp->vb_buf.b_proc = bp->b_proc; nbp->vb_buf.b_iodone = vndiodone; nbp->vb_buf.b_vp = NULLVP; - LIST_INIT(&nbp->vb_buf.b_dep); nbp->vb_xfer = vnx; |
