[PATCH] Revert ABI-breaking change in /proc

Some user tools parse /proc/scsi/scsi, so we can't yet change the names.
Change the existing ones back to their old names, and add an admonition
to not make the same mistake that I did.

Andrew Morton reports that this was breaking YDL 4.1 userspace.

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index c51b576..7a054f9 100644 (file)
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -96,22 +96,26 @@ unsigned int scsi_logging_level;
 EXPORT_SYMBOL(scsi_logging_level);
 #endif
 
+/* NB: These are exposed through /proc/scsi/scsi and form part of the ABI.
+ * You may not alter any existing entry (although adding new ones is
+ * encouraged once assigned by ANSI/INCITS T10
+ */
 static const char *const scsi_device_types[] = {
-       "Direct access    ",
-       "Sequential access",
+       "Direct-Access    ",
+       "Sequential-Access",
        "Printer          ",
        "Processor        ",
        "WORM             ",
-       "CD/DVD           ",
+       "CD-ROM           ",
        "Scanner          ",
-       "Optical memory   ",
-       "Media changer    ",
+       "Optical Device   ",
+       "Medium Changer   ",
        "Communications   ",
        "ASC IT8          ",
        "ASC IT8          ",
        "RAID             ",
        "Enclosure        ",
-       "Direct access RBC",
+       "Direct-Access-RBC",
        "Optical card     ",
        "Bridge controller",
        "Object storage   ",