aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi.c
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew@wil.cx>2006-09-24 22:22:52 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-24 22:49:01 -0400
commit8a1cdc9ca264c49ad0b896e43468fe6a4b0b646c (patch)
tree406c8b5359c9b96b368924f2d6f1ca1942e5eb3d /drivers/scsi/scsi.c
parent508df253dbefb0385a629370f4244e3db197d3b8 (diff)
[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>
Diffstat (limited to 'drivers/scsi/scsi.c')
-rw-r--r--drivers/scsi/scsi.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index c51b5769eac8..7a054f9d1ee3 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -96,22 +96,26 @@ unsigned int scsi_logging_level;
96EXPORT_SYMBOL(scsi_logging_level); 96EXPORT_SYMBOL(scsi_logging_level);
97#endif 97#endif
98 98
99/* NB: These are exposed through /proc/scsi/scsi and form part of the ABI.
100 * You may not alter any existing entry (although adding new ones is
101 * encouraged once assigned by ANSI/INCITS T10
102 */
99static const char *const scsi_device_types[] = { 103static const char *const scsi_device_types[] = {
100 "Direct access ", 104 "Direct-Access ",
101 "Sequential access", 105 "Sequential-Access",
102 "Printer ", 106 "Printer ",
103 "Processor ", 107 "Processor ",
104 "WORM ", 108 "WORM ",
105 "CD/DVD ", 109 "CD-ROM ",
106 "Scanner ", 110 "Scanner ",
107 "Optical memory ", 111 "Optical Device ",
108 "Media changer ", 112 "Medium Changer ",
109 "Communications ", 113 "Communications ",
110 "ASC IT8 ", 114 "ASC IT8 ",
111 "ASC IT8 ", 115 "ASC IT8 ",
112 "RAID ", 116 "RAID ",
113 "Enclosure ", 117 "Enclosure ",
114 "Direct access RBC", 118 "Direct-Access-RBC",
115 "Optical card ", 119 "Optical card ",
116 "Bridge controller", 120 "Bridge controller",
117 "Object storage ", 121 "Object storage ",