diff options
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ata/atapi-cd.c | 5 | ||||
| -rw-r--r-- | sys/dev/ccd/ccd.c | 9 | ||||
| -rw-r--r-- | sys/dev/mcd/mcd.c | 6 | ||||
| -rw-r--r-- | sys/dev/scd/scd.c | 5 | ||||
| -rw-r--r-- | sys/dev/vinum/vinumioctl.c | 11 | ||||
| -rw-r--r-- | sys/dev/vinum/vinumobj.h | 1 |
6 files changed, 0 insertions, 37 deletions
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c index 51cc51d..df65921 100644 --- a/sys/dev/ata/atapi-cd.c +++ b/sys/dev/ata/atapi-cd.c @@ -1038,11 +1038,6 @@ acdioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct thread *td) error = EBADF; break; - case DIOCGPART: - ((struct partinfo *)addr)->disklab = &cdp->disklabel; - ((struct partinfo *)addr)->part = &cdp->disklabel.d_partitions[0]; - break; - default: error = ENOTTY; } diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c index 05ebb97..4c84a81 100644 --- a/sys/dev/ccd/ccd.c +++ b/sys/dev/ccd/ccd.c @@ -1505,15 +1505,6 @@ ccdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td) *(struct disklabel *)data = cs->sc_label; break; - case DIOCGPART: - if (!IS_INITED(cs)) - return (ENXIO); - - ((struct partinfo *)data)->disklab = &cs->sc_label; - ((struct partinfo *)data)->part = - &cs->sc_label.d_partitions[ccdpart(dev)]; - break; - case DIOCWDINFO: case DIOCSDINFO: if (!IS_INITED(cs)) diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c index 8531475..ad6c2d9 100644 --- a/sys/dev/mcd/mcd.c +++ b/sys/dev/mcd/mcd.c @@ -578,12 +578,6 @@ MCD_TRACE("ioctl called 0x%lx\n", cmd); case DIOCGDINFO: *(struct disklabel *) addr = cd->dlabel; return 0; - case DIOCGPART: - ((struct partinfo *) addr)->disklab = &cd->dlabel; - ((struct partinfo *) addr)->part = - &cd->dlabel.d_partitions[mcd_part(dev)]; - return 0; - /* * a bit silly, but someone might want to test something on a * section of cdrom. diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c index fb11abb..b6f2e86 100644 --- a/sys/dev/scd/scd.c +++ b/sys/dev/scd/scd.c @@ -436,11 +436,6 @@ scdioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct thread *td) case DIOCGDINFO: *(struct disklabel *)addr = cd->dlabel; return 0; - case DIOCGPART: - ((struct partinfo *)addr)->disklab = &cd->dlabel; - ((struct partinfo *)addr)->part = - &cd->dlabel.d_partitions[0]; - return 0; case CDIOCPLAYTRACKS: return scd_playtracks(unit, (struct ioc_play_track *) addr); case CDIOCPLAYBLOCKS: diff --git a/sys/dev/vinum/vinumioctl.c b/sys/dev/vinum/vinumioctl.c index 94a9790..0e5f696 100644 --- a/sys/dev/vinum/vinumioctl.c +++ b/sys/dev/vinum/vinumioctl.c @@ -388,17 +388,6 @@ vinumioctl(dev_t dev, break; /* - * Care! DIOCGPART returns *pointers* to - * the caller, so we need to store this crap - * as well. And yes, we need it. - */ - case DIOCGPART: /* get partition information */ - get_volume_label(vol->name, vol->plexes, vol->size, &vol->label); - ((struct partinfo *) data)->disklab = &vol->label; - ((struct partinfo *) data)->part = &vol->label.d_partitions[0]; - break; - - /* * We don't have this stuff on hardware, * so just pretend to do it so that * utilities don't get upset. diff --git a/sys/dev/vinum/vinumobj.h b/sys/dev/vinum/vinumobj.h index 457189e..8a7868f 100644 --- a/sys/dev/vinum/vinumobj.h +++ b/sys/dev/vinum/vinumobj.h @@ -305,7 +305,6 @@ struct _volume */ int plex[MAXPLEX]; /* index of plexes */ #ifdef _KERNEL - struct disklabel label; /* for DIOCGPART */ dev_t dev; /* associated device */ #endif }; |
