diff options
| -rw-r--r-- | sys/dev/vinum/vinumioctl.c | 3 | ||||
| -rw-r--r-- | sys/geom/geom_dev.c | 5 | ||||
| -rw-r--r-- | sys/kern/subr_diskslice.c | 33 | ||||
| -rw-r--r-- | sys/sys/disklabel.h | 1 | ||||
| -rw-r--r-- | sys/sys/diskmbr.h | 1 | ||||
| -rw-r--r-- | sys/sys/diskpc98.h | 1 |
6 files changed, 0 insertions, 44 deletions
diff --git a/sys/dev/vinum/vinumioctl.c b/sys/dev/vinum/vinumioctl.c index b626b1e..fdfc8f6 100644 --- a/sys/dev/vinum/vinumioctl.c +++ b/sys/dev/vinum/vinumioctl.c @@ -384,9 +384,6 @@ vinumioctl(dev_t dev, return EIO; /* I/O error */ switch (cmd) { - case DIOCGDVIRGIN: /* get disk label */ - get_volume_label(vol->name, vol->plexes, vol->size, (struct disklabel *) data); - break; case DIOCGMEDIASIZE: *(off_t *)data = vol->size << DEV_BSHIFT; diff --git a/sys/geom/geom_dev.c b/sys/geom/geom_dev.c index 1aaac8c..9b058c8 100644 --- a/sys/geom/geom_dev.c +++ b/sys/geom/geom_dev.c @@ -297,11 +297,6 @@ g_dev_ioctl(dev_t dev, u_long cmd, caddr_t data, int fflag, struct thread *td) break; } - if (error != 0 && cmd == DIOCGDVIRGIN) { - g_topology_lock(); - gp = g_create_geomf("BSD", cp->provider, NULL); - g_topology_unlock(); - } PICKUP_GIANT(); g_waitidle(); if (error == ENOIOCTL) { diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c index 06c207b..07b028a 100644 --- a/sys/kern/subr_diskslice.c +++ b/sys/kern/subr_diskslice.c @@ -371,39 +371,6 @@ dsioctl(dev, cmd, data, flags, sspp) *(struct disklabel *)data = *lp; return (0); - case DIOCGDVIRGIN: - lp = (struct disklabel *)data; - if (ssp->dss_slices[WHOLE_DISK_SLICE].ds_label) { - *lp = *ssp->dss_slices[WHOLE_DISK_SLICE].ds_label; - } else { - bzero(lp, sizeof(struct disklabel)); - } - - lp->d_magic = DISKMAGIC; - lp->d_magic2 = DISKMAGIC; - pp = &lp->d_partitions[RAW_PART]; - pp->p_offset = 0; - pp->p_size = sp->ds_size; - - lp->d_npartitions = MAXPARTITIONS; - if (lp->d_interleave == 0) - lp->d_interleave = 1; - if (lp->d_rpm == 0) - lp->d_rpm = 3600; - if (lp->d_nsectors == 0) - lp->d_nsectors = 32; - if (lp->d_ntracks == 0) - lp->d_ntracks = 64; - - lp->d_bbsize = BBSIZE; - lp->d_sbsize = 0; - lp->d_secpercyl = lp->d_nsectors * lp->d_ntracks; - lp->d_ncylinders = sp->ds_size / lp->d_secpercyl; - lp->d_secperunit = sp->ds_size; - lp->d_checksum = 0; - lp->d_checksum = dkcksum(lp); - return (0); - case DIOCGMEDIASIZE: if (lp == NULL) *(off_t *)data = (off_t)sp->ds_size * ssp->dss_secsize; diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h index 5558b20..24cf539 100644 --- a/sys/sys/disklabel.h +++ b/sys/sys/disklabel.h @@ -355,7 +355,6 @@ CTASSERT(sizeof (struct dos_partition) == 16); #define DIOCGDINFO _IOR('d', 101, struct disklabel)/* get */ #define DIOCSDINFO _IOW('d', 102, struct disklabel)/* set */ #define DIOCWDINFO _IOW('d', 103, struct disklabel)/* set, update disk */ -#define DIOCGDVIRGIN _IOR('d', 105, struct disklabel)/* get virgin label */ #define DIOCWLABEL _IOW('d', 109, int) /* write en/disable label */ diff --git a/sys/sys/diskmbr.h b/sys/sys/diskmbr.h index 5558b20..24cf539 100644 --- a/sys/sys/diskmbr.h +++ b/sys/sys/diskmbr.h @@ -355,7 +355,6 @@ CTASSERT(sizeof (struct dos_partition) == 16); #define DIOCGDINFO _IOR('d', 101, struct disklabel)/* get */ #define DIOCSDINFO _IOW('d', 102, struct disklabel)/* set */ #define DIOCWDINFO _IOW('d', 103, struct disklabel)/* set, update disk */ -#define DIOCGDVIRGIN _IOR('d', 105, struct disklabel)/* get virgin label */ #define DIOCWLABEL _IOW('d', 109, int) /* write en/disable label */ diff --git a/sys/sys/diskpc98.h b/sys/sys/diskpc98.h index 5558b20..24cf539 100644 --- a/sys/sys/diskpc98.h +++ b/sys/sys/diskpc98.h @@ -355,7 +355,6 @@ CTASSERT(sizeof (struct dos_partition) == 16); #define DIOCGDINFO _IOR('d', 101, struct disklabel)/* get */ #define DIOCSDINFO _IOW('d', 102, struct disklabel)/* set */ #define DIOCWDINFO _IOW('d', 103, struct disklabel)/* set, update disk */ -#define DIOCGDVIRGIN _IOR('d', 105, struct disklabel)/* get virgin label */ #define DIOCWLABEL _IOW('d', 109, int) /* write en/disable label */ |
