MFC of 276737, 322200, 322201, 322271, and 322297

276737: Remove old ioctl use and support
322200: Remove (broken) search for alternate superblocks
322201: Show differences when alternate superblock fails to match
322271: Cleanup for 322200.
322297: Restore fsck_ffs ability to find alternate superblocks

Discussed with: kib, imp
Differential Revision: https://reviews.freebsd.org/D11589
Approved by: re (kib)

2 files changed, 2 insertions, 16 deletions

diff --git a/share/man/man4/cd.4 b/share/man/man4/cd.4
index 495b28d..881edda 100644
--- a/share/man/man4/cd.4
+++ b/share/man/man4/cd.4
@@ -101,16 +101,6 @@ in the header files
 and
 .In sys/disklabel.h .
 .Bl -tag -width CDIOCREADSUBCHANNEL
-.It Dv DIOCGDINFO
-.It Dv DIOCSDINFO
-.Pq Li "struct disklabel"
-Read or write the in-core copy of the disklabel for the
-drive.
-The disklabel is initialized with information
-read from the scsi inquiry commands, and should be the same as
-the information printed at boot.
-This structure is defined in the header file
-.In sys/disklabel.h .
 .It Dv CDIOCPLAYTRACKS
 .Pq Li "struct ioc_play_track"
 Start audio playback given a track address and length.
diff --git a/share/man/man4/mcd.4 b/share/man/man4/mcd.4
index 380a966..7066797 100644
--- a/share/man/man4/mcd.4
+++ b/share/man/man4/mcd.4
@@ -61,12 +61,8 @@ The
 driver responds to disk-specific
 .Fn ioctl
 commands, namely the
-.Dv DIOCGDINFO ,
-.Dv DIOCGPART ,
-.Dv DIOCWDINFO ,
-and
-.Dv DIOCSDINFO ,
-commands.
+.Dv DIOCGPART
+command.
 Other disk-specific
 .Fn ioctl
 commands will return an error.