Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

introduce a variant of disk_attach/detach, for pseudo disks

Browse Source 
which is opened by user before being attached.
This commit is contained in:
yamt 2005-08-20 12:00:01 +00:00
parent 7b9a62a31f
commit 6f645a09cb
2 changed files with 76 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
sys/kern/subr_disk.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: subr_disk.c,v 1.69 2005/05/29 22:24:15 christos Exp $ */
/* $NetBSD: subr_disk.c,v 1.70 2005/08/20 12:00:01 yamt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1999, 2000 The NetBSD Foundation, Inc.
@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: subr_disk.c,v 1.69 2005/05/29 22:24:15 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: subr_disk.c,v 1.70 2005/08/20 12:00:01 yamt Exp $");
#include "opt_compat_netbsd.h"
@ -200,11 +200,21 @@ disk_find(char *name)
return (NULL);
}
/*
* Attach a disk.
*/
void
disk_attach(struct disk *diskp)
static void
disk_init0(struct disk *diskp)
{
/*
* Initialize the wedge-related locks and other fields.
*/
lockinit(&diskp->dk_rawlock, PRIBIO, "dkrawlk", 0, 0);
lockinit(&diskp->dk_openlock, PRIBIO, "dkoplk", 0, 0);
LIST_INIT(&diskp->dk_wedges);
diskp->dk_nwedges = 0;
}
static void
disk_attach0(struct disk *diskp)
{
int s;
@ -222,14 +232,6 @@ disk_attach(struct disk *diskp)
memset(diskp->dk_label, 0, sizeof(struct disklabel));
memset(diskp->dk_cpulabel, 0, sizeof(struct cpu_disklabel));
/*
* Initialize the wedge-related locks and other fields.
*/
lockinit(&diskp->dk_rawlock, PRIBIO, "dkrawlk", 0, 0);
lockinit(&diskp->dk_openlock, PRIBIO, "dkoplk", 0, 0);
LIST_INIT(&diskp->dk_wedges);
diskp->dk_nwedges = 0;
/*
* Set the attached timestamp.
*/
@ -246,15 +248,10 @@ disk_attach(struct disk *diskp)
simple_unlock(&disklist_slock);
}
/*
* Detach a disk.
*/
void
disk_detach(struct disk *diskp)
static void
disk_detach0(struct disk *diskp)
{
(void) lockmgr(&diskp->dk_openlock, LK_DRAIN, NULL);
/*
* Remove from the disklist.
*/
@ -272,6 +269,59 @@ disk_detach(struct disk *diskp)
free(diskp->dk_cpulabel, M_DEVBUF);
}
/*
* Attach a disk.
*/
void
disk_attach(struct disk *diskp)
{
disk_init0(diskp);
disk_attach0(diskp);
}
/*
* Detach a disk.
*/
void
disk_detach(struct disk *diskp)
{
(void) lockmgr(&diskp->dk_openlock, LK_DRAIN, NULL);
disk_detach0(diskp);
}
/*
* Initialize a pseudo disk.
*/
void
pseudo_disk_init(struct disk *diskp)
{
disk_init0(diskp);
}
/*
* Attach a pseudo disk.
*/
void
pseudo_disk_attach(struct disk *diskp)
{
disk_attach0(diskp);
}
/*
* Detach a pseudo disk.
*/
void
pseudo_disk_detach(struct disk *diskp)
{
disk_detach0(diskp);
}
/*
* Increment a disk's busy counter. If the counter is going from
* 0 to 1, set the timestamp.

5
sys/sys/disk.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: disk.h,v 1.29 2005/02/03 19:20:01 perry Exp $ */
/* $NetBSD: disk.h,v 1.30 2005/08/20 12:00:01 yamt Exp $ */
/*-
* Copyright (c) 1996, 1997, 2004 The NetBSD Foundation, Inc.
@ -318,6 +318,9 @@ struct proc;
void disk_attach(struct disk *);
void disk_detach(struct disk *);
void pseudo_disk_init(struct disk *);
void pseudo_disk_attach(struct disk *);
void pseudo_disk_detach(struct disk *);
void disk_busy(struct disk *);
void disk_unbusy(struct disk *, long, int);
void disk_resetstat(struct disk *);