diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2010-09-22 05:29:00 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2010-09-22 05:29:00 +0000 |
| commit | a7071fb4b3a7688592a8a02ffba742f02226a152 (patch) | |
| tree | 6b39af0b6dd510b141aaa326c354c7865b0dd573 | |
| parent | 89c85476bf6f7b13b0330bec0572d273d1b4eb7a (diff) | |
Garbage collect the field dk_labelsector since there are no uses
in the tree. Update disk.9 to reflect current reality.
ok matthew@ deraadt@
| -rw-r--r-- | share/man/man9/disk.9 | 12 | ||||
| -rw-r--r-- | sys/sys/disk.h | 5 |
2 files changed, 8 insertions, 9 deletions
diff --git a/share/man/man9/disk.9 b/share/man/man9/disk.9 index 31df0bc8367..44bbb40ba31 100644 --- a/share/man/man9/disk.9 +++ b/share/man/man9/disk.9 @@ -1,4 +1,4 @@ -.\" $OpenBSD: disk.9,v 1.26 2007/06/25 17:30:07 jmc Exp $ +.\" $OpenBSD: disk.9,v 1.27 2010/09/22 05:28:59 krw Exp $ .\" $NetBSD: disk.9,v 1.2 1996/04/08 20:41:25 jtc Exp $ .\" .\" Copyright (c) 1995, 1996 Jason R. Thorpe. @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: June 25 2007 $ +.Dd $Mdocdate: September 22 2010 $ .Dt DISK 9 .Os .Sh NAME @@ -63,7 +63,10 @@ structure, which is defined as follows: struct disk { TAILQ_ENTRY(disk) dk_link; /* link in global disklist */ struct rwlock dk_lock; /* disk lock */ + struct mutex dk_mtx; /* busy/unbusy mtx */ char *dk_name; /* disk name */ + struct device *dk_device; /* disk device structure. */ + dev_t dk_devno; /* disk device number. */ int dk_flags; /* disk flags */ #define DKF_CONSTRUCTED 0x0001 @@ -88,15 +91,12 @@ struct disk { int dk_blkshift; /*shift to convert DEV_BSIZE to blks*/ int dk_byteshift; /* shift to convert bytes to blks */ - struct dkdriver *dk_driver; /* pointer to driver */ - /* * Disk label information. Storage for the in-core disk label * must be dynamically allocated, otherwise the size of this * structure becomes machine-dependent. */ - daddr64_t dk_labelsector; /* sector containing label */ - struct disklabel *dk_label; /* label */ + struct disklabel *dk_label; }; .Ed .Pp diff --git a/sys/sys/disk.h b/sys/sys/disk.h index 3da927463d2..c4722185918 100644 --- a/sys/sys/disk.h +++ b/sys/sys/disk.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disk.h,v 1.25 2010/09/08 15:16:22 jsing Exp $ */ +/* $OpenBSD: disk.h,v 1.26 2010/09/22 05:28:59 krw Exp $ */ /* $NetBSD: disk.h,v 1.11 1996/04/28 20:22:50 thorpej Exp $ */ /* @@ -108,8 +108,7 @@ struct disk { * must be dynamically allocated, otherwise the size of this * structure becomes machine-dependent. */ - daddr64_t dk_labelsector; /* sector containing label */ - struct disklabel *dk_label; /* label */ + struct disklabel *dk_label; }; /* states */ |