summaryrefslogtreecommitdiff
path: root/sys/geom/geom_disk.c
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>2002-06-09 10:57:34 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>2002-06-09 10:57:34 +0000
commit503abe45402556db07071fca9192a54c6747781f (patch)
tree2aee47df7b4c048e552dfb36f69f352adcc71438 /sys/geom/geom_disk.c
parent56cf50ad48fda74357412d8a3781887ce34979cd (diff)
downloadsrc-test-503abe45402556db07071fca9192a54c6747781f.tar.gz
src-test-503abe45402556db07071fca9192a54c6747781f.zip
Notes
Diffstat (limited to 'sys/geom/geom_disk.c')
-rw-r--r--sys/geom/geom_disk.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c
index 846694d710a33..acbee247ac9da 100644
--- a/sys/geom/geom_disk.c
+++ b/sys/geom/geom_disk.c
@@ -60,7 +60,7 @@ struct g_class g_disk_class = {
"DISK",
NULL,
NULL,
- G_CLASS_INITSTUFF
+ G_CLASS_INITIALIZER
};
static int
@@ -152,19 +152,19 @@ g_disk_start(struct bio *bp)
mtx_unlock(&Giant);
break;
case BIO_GETATTR:
- if (g_haveattr_int(bp, "GEOM::sectorsize",
+ if (g_handleattr_int(bp, "GEOM::sectorsize",
dp->d_label.d_secsize))
break;
- else if (g_haveattr_int(bp, "GEOM::fwsectors",
+ else if (g_handleattr_int(bp, "GEOM::fwsectors",
dp->d_label.d_nsectors))
break;
- else if (g_haveattr_int(bp, "GEOM::fwheads",
+ else if (g_handleattr_int(bp, "GEOM::fwheads",
dp->d_label.d_ntracks))
break;
- else if (g_haveattr_off_t(bp, "GEOM::mediasize",
+ else if (g_handleattr_off_t(bp, "GEOM::mediasize",
dp->d_label.d_secsize * (off_t)dp->d_label.d_secperunit))
break;
- else if (g_haveattr_off_t(bp, "GEOM::frontstuff", 0))
+ else if (g_handleattr_off_t(bp, "GEOM::frontstuff", 0))
break;
else if (!strcmp(bp->bio_attribute, "GEOM::kerneldump"))
g_disk_kerneldump(bp, dp);