I can't find any mention of dk_labelsector in the tree, and disk.9
has fallen a bit behind.
ok?
.... Ken
Index: sys/sys/disk.h
===================================================================
RCS file: /cvs/src/sys/sys/disk.h,v
retrieving revision 1.25
diff -u -p -r1.25 disk.h
--- sys/sys/disk.h 8 Sep 2010 15:16:22 -0000 1.25
+++ sys/sys/disk.h 21 Sep 2010 22:41:22 -0000
@@ -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 */
Index: share/man/man9/disk.9
===================================================================
RCS file: /cvs/src/share/man/man9/disk.9,v
retrieving revision 1.26
diff -u -p -r1.26 disk.9
--- share/man/man9/disk.9 25 Jun 2007 17:30:07 -0000 1.26
+++ share/man/man9/disk.9 21 Sep 2010 22:41:22 -0000
@@ -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
