summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authoryamt <yamt@NetBSD.org>2005-08-20 12:01:04 +0000
committeryamt <yamt@NetBSD.org>2005-08-20 12:01:04 +0000
commitbc505ef8ddcc6fa7e44c76a5d8f47301f011ad8e (patch)
treea13dd272340dc525faa95c6a89d66d35c9d59bc2 /sys/dev
parent6f645a09cba436bdc9a81257df9bb8e9cc6fe55e (diff)
use pseudo_disk_{init,attach,detach} where appropriate.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ccd.c9
-rw-r--r--sys/dev/cgd.c9
-rw-r--r--sys/dev/raidframe/rf_netbsdkintf.c9
-rw-r--r--sys/dev/vnd.c9
4 files changed, 20 insertions, 16 deletions
diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c
index 48fef5a7a58..b131a9f4e16 100644
--- a/sys/dev/ccd.c
+++ b/sys/dev/ccd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.104 2005/05/22 15:54:46 christos Exp $ */
+/* $NetBSD: ccd.c,v 1.105 2005/08/20 12:01:04 yamt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -125,7 +125,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.104 2005/05/22 15:54:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.105 2005/08/20 12:01:04 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -261,6 +261,7 @@ ccdattach(int num)
snprintf(cs->sc_xname, sizeof(cs->sc_xname), "ccd%d", i);
cs->sc_dkdev.dk_name = cs->sc_xname; /* XXX */
lockinit(&cs->sc_lock, PRIBIO, "ccdlk", 0, 0);
+ pseudo_disk_init(&cs->sc_dkdev);
}
}
@@ -1131,7 +1132,7 @@ ccdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
bufq_alloc(&cs->sc_bufq, BUFQ_FCFS);
/* Attach the disk. */
- disk_attach(&cs->sc_dkdev);
+ pseudo_disk_attach(&cs->sc_dkdev);
/* Try and read the disklabel. */
ccdgetdisklabel(dev);
@@ -1190,7 +1191,7 @@ ccdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
cs->sc_flags &= ~(CCDF_INITED|CCDF_VLABEL);
/* Detatch the disk. */
- disk_detach(&cs->sc_dkdev);
+ pseudo_disk_detach(&cs->sc_dkdev);
break;
case DIOCGDINFO:
diff --git a/sys/dev/cgd.c b/sys/dev/cgd.c
index 27fa53b5a8b..52734d05fb6 100644
--- a/sys/dev/cgd.c
+++ b/sys/dev/cgd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.27 2005/06/28 20:23:02 drochner Exp $ */
+/* $NetBSD: cgd.c,v 1.28 2005/08/20 12:01:04 yamt Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.27 2005/06/28 20:23:02 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.28 2005/08/20 12:01:04 yamt Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -172,6 +172,7 @@ cgdsoftc_init(struct cgd_softc *cs, int num)
snprintf(sbuf, DK_XNAME_SIZE, "cgd%d", num);
simple_lock_init(&cs->sc_slock);
dk_sc_init(&cs->sc_dksc, cs, sbuf);
+ pseudo_disk_init(&cs->sc_dksc.sc_dkdev);
}
void
@@ -571,7 +572,7 @@ cgd_ioctl_set(struct cgd_softc *cs, void *data, struct proc *p)
cs->sc_dksc.sc_flags |= DKF_INITED;
/* Attach the disk. */
- disk_attach(&cs->sc_dksc.sc_dkdev);
+ pseudo_disk_attach(&cs->sc_dksc.sc_dkdev);
/* Try and read the disklabel. */
dk_getdisklabel(di, &cs->sc_dksc, 0 /* XXX ? */);
@@ -601,7 +602,7 @@ cgd_ioctl_clr(struct cgd_softc *cs, void *data, struct proc *p)
free(cs->sc_data, M_DEVBUF);
cs->sc_data_used = 0;
cs->sc_dksc.sc_flags &= ~DKF_INITED;
- disk_detach(&cs->sc_dksc.sc_dkdev);
+ pseudo_disk_detach(&cs->sc_dksc.sc_dkdev);
return 0;
}
diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c
index ec7b0672192..944060c78b4 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.187 2005/05/29 22:03:09 christos Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.188 2005/08/20 12:01:04 yamt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -146,7 +146,7 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.187 2005/05/29 22:03:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.188 2005/08/20 12:01:04 yamt Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -396,6 +396,7 @@ raidattach(int num)
for (raidID = 0; raidID < num; raidID++) {
bufq_alloc(&raid_softc[raidID].buf_queue, BUFQ_FCFS);
+ pseudo_disk_init(&raid_softc[raidID].sc_dkdev);
raidrootdev[raidID].dv_class = DV_DISK;
raidrootdev[raidID].dv_cfdata = NULL;
@@ -667,7 +668,7 @@ raidclose(dev_t dev, int flags, int fmt, struct proc *p)
rs->sc_flags &= ~RAIDF_INITED;
/* Detach the disk. */
- disk_detach(&rs->sc_dkdev);
+ pseudo_disk_detach(&rs->sc_dkdev);
}
}
@@ -1617,7 +1618,7 @@ raidinit(RF_Raid_t *raidPtr)
* other things, so it's critical to call this *BEFORE* we try putzing
* with disklabels. */
- disk_attach(&rs->sc_dkdev);
+ pseudo_disk_attach(&rs->sc_dkdev);
/* XXX There may be a weird interaction here between this, and
* protectedSectors, as used in RAIDframe. */
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c
index 62d5343c464..77f64612c74 100644
--- a/sys/dev/vnd.c
+++ b/sys/dev/vnd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.120 2005/08/19 02:04:03 christos Exp $ */
+/* $NetBSD: vnd.c,v 1.121 2005/08/20 12:01:04 yamt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.120 2005/08/19 02:04:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.121 2005/08/20 12:01:04 yamt Exp $");
#if defined(_KERNEL_OPT)
#include "fs_nfs.h"
@@ -277,6 +277,7 @@ vndattach(int num)
vnd_softc[i].sc_comp_decombuf = NULL;
bufq_alloc(&vnd_softc[i].sc_tab,
BUFQ_DISKSORT|BUFQ_SORT_RAWBLOCK);
+ pseudo_disk_init(&vnd_softc[i].sc_dkdev);
}
}
@@ -1108,7 +1109,7 @@ vndioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
/* Attach the disk. */
vnd->sc_dkdev.dk_name = vnd->sc_xname;
- disk_attach(&vnd->sc_dkdev);
+ pseudo_disk_attach(&vnd->sc_dkdev);
/* Initialize the xfer and buffer pools. */
pool_init(&vnd->sc_vxpool, sizeof(struct vndxfer), 0,
@@ -1179,7 +1180,7 @@ unlock_and_exit:
pool_destroy(&vnd->sc_vbpool);
/* Detatch the disk. */
- disk_detach(&vnd->sc_dkdev);
+ pseudo_disk_detach(&vnd->sc_dkdev);
break;