summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorgrog <grog@FreeBSD.org>2002-12-18 00:18:54 +0000
committergrog <grog@FreeBSD.org>2002-12-18 00:18:54 +0000
commit321876056d04efe95b72d40d99ffd0ac1fcbf152 (patch)
tree1b95f32be9fc604c87a21cef65377471559b5269 /sys
parent027582d5b77e0b182c39b50d978919c1304bd539 (diff)
downloadFreeBSD-src-321876056d04efe95b72d40d99ffd0ac1fcbf152.zip
FreeBSD-src-321876056d04efe95b72d40d99ffd0ac1fcbf152.tar.gz
Back out revision 1.38. disklabel now understands vinum volumes again.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/vinum/vinumioctl.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/dev/vinum/vinumioctl.c b/sys/dev/vinum/vinumioctl.c
index 692309d..4d4d9d7 100644
--- a/sys/dev/vinum/vinumioctl.c
+++ b/sys/dev/vinum/vinumioctl.c
@@ -329,7 +329,7 @@ vinumioctl(dev_t dev,
sd = &SD[objno];
switch (cmd) {
- case DIOCGDINFO: /* get disk label */
+ case DIOCGDINFO: /* get disk label */
get_volume_label(sd->name, 1, sd->sectors, (struct disklabel *) data);
break;
@@ -389,10 +389,6 @@ vinumioctl(dev_t dev,
*(off_t *)data = vol->size << DEV_BSHIFT;
break;
- case DIOCGDINFO: /* get disk label */
- get_volume_label(vol->name, 1, vol->size, (struct disklabel *) data);
- break;
-
case DIOCGSECTORSIZE:
*(u_int *)data = DEV_BSIZE;
break;
OpenPOWER on IntegriCloud