hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/drivers/scsi/scsi_devinfo.c
....@@ -232,6 +232,7 @@
232232 {"SGI", "RAID5", "*", BLIST_SPARSELUN},
233233 {"SGI", "TP9100", "*", BLIST_REPORTLUN2},
234234 {"SGI", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
235
+ {"SKhynix", "H28U74301AMR", NULL, BLIST_SKIP_VPD_PAGES},
235236 {"IBM", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
236237 {"SUN", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
237238 {"DELL", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
....@@ -240,6 +241,9 @@
240241 {"LSI", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
241242 {"ENGENIO", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
242243 {"LENOVO", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
244
+ {"FUJITSU", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
245
+ {"SanDisk", "Cruzer Blade", NULL, BLIST_TRY_VPD_PAGES |
246
+ BLIST_INQUIRY_36},
243247 {"SMSC", "USB 2 HS-CF", NULL, BLIST_SPARSELUN | BLIST_INQUIRY_36},
244248 {"SONY", "CD-ROM CDU-8001", NULL, BLIST_BORKEN},
245249 {"SONY", "TSL", NULL, BLIST_FORCELUN}, /* DDS3 & DDS4 autoloaders */
....@@ -735,13 +739,12 @@
735739 return err;
736740 }
737741
738
-static const struct file_operations scsi_devinfo_proc_fops = {
739
- .owner = THIS_MODULE,
740
- .open = proc_scsi_devinfo_open,
741
- .read = seq_read,
742
- .write = proc_scsi_devinfo_write,
743
- .llseek = seq_lseek,
744
- .release = seq_release,
742
+static const struct proc_ops scsi_devinfo_proc_ops = {
743
+ .proc_open = proc_scsi_devinfo_open,
744
+ .proc_read = seq_read,
745
+ .proc_write = proc_scsi_devinfo_write,
746
+ .proc_lseek = seq_lseek,
747
+ .proc_release = seq_release,
745748 };
746749 #endif /* CONFIG_SCSI_PROC_FS */
747750
....@@ -866,7 +869,7 @@
866869 }
867870
868871 #ifdef CONFIG_SCSI_PROC_FS
869
- p = proc_create("scsi/device_info", 0, NULL, &scsi_devinfo_proc_fops);
872
+ p = proc_create("scsi/device_info", 0, NULL, &scsi_devinfo_proc_ops);
870873 if (!p) {
871874 error = -ENOMEM;
872875 goto out;