summaryrefslogtreecommitdiffstats
path: root/sys/kern/subr_disk.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/kern/subr_disk.c')
-rw-r--r--sys/kern/subr_disk.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index d33a152d299..e1dbaa310b6 100644
--- a/sys/kern/subr_disk.c
+++ b/sys/kern/subr_disk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_disk.c,v 1.94 2009/06/14 00:09:40 deraadt Exp $ */
+/* $OpenBSD: subr_disk.c,v 1.95 2009/06/17 01:30:30 thib Exp $ */
/* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */
/*
@@ -768,10 +768,6 @@ disk_construct(struct disk *diskp, char *lockname)
rw_init(&diskp->dk_lock, "dklk");
mtx_init(&diskp->dk_mtx, IPL_BIO);
- diskp->dk_bufq = bufq_init(BUFQ_DEFAULT);
- if (diskp->dk_bufq == NULL)
- return (1);
-
diskp->dk_flags |= DKF_CONSTRUCTED;
return (0);
@@ -785,8 +781,7 @@ disk_attach(struct disk *diskp)
{
if (!ISSET(diskp->dk_flags, DKF_CONSTRUCTED))
- if (disk_construct(diskp, diskp->dk_name))
- panic("disk_attach: can't construct disk");
+ disk_construct(diskp, diskp->dk_name);
/*
* Allocate and initialize the disklabel structures. Note that
@@ -829,8 +824,6 @@ disk_detach(struct disk *diskp)
*/
free(diskp->dk_label, M_DEVBUF);
- bufq_destroy(diskp->dk_bufq);
-
/*
* Remove from the disklist.
*/