summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
authormarcel <marcel@FreeBSD.org>2009-07-08 05:56:14 +0000
committermarcel <marcel@FreeBSD.org>2009-07-08 05:56:14 +0000
commit8fa709769a72b5c4b2e95bf92bb0b53836b4881a (patch)
tree5caadd9b3e91865617319d5117cb5c08cd75adf6 /sys/dev
parent13615958a8931e00cfc0760e1d87d16a8e52a40a (diff)
downloadFreeBSD-src-8fa709769a72b5c4b2e95bf92bb0b53836b4881a.zip
FreeBSD-src-8fa709769a72b5c4b2e95bf92bb0b53836b4881a.tar.gz
Revert revisions 188839 and 188868. Use of the ioctl in geom_dev.c
is invalid because the ioctl happens without prior open. The ioctl got introduced to provide backward compatibility for extended partitions, but it ended up not being used because it didn't work as expected. Since there are no consumers of the ioctl and the implementation is broken, the best fix is to remove the code entirely. Spotted by: phk Approved by: re (kensmith)
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ata/atapi-cd.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c
index 7fd80c4..aee8374 100644
--- a/sys/dev/ata/atapi-cd.c
+++ b/sys/dev/ata/atapi-cd.c
@@ -219,10 +219,7 @@ acd_geom_ioctl(struct g_provider *pp, u_long cmd, void *addr, int fflag, struct
case CDIOCRESET:
acd_test_ready(dev);
break;
-
- case DIOCGPROVIDERALIAS:
- break;
-
+
default:
acd_read_toc(dev);
acd_prevent_allow(dev, 1);
OpenPOWER on IntegriCloud