mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/scsi/scsi_devinfo.c
..
..
@@ -240,6 +240,9 @@
240
240
 	{"LSI", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
241
241
 	{"ENGENIO", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
242
242
 	{"LENOVO", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
243
+	{"FUJITSU", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
244
+	{"SanDisk", "Cruzer Blade", NULL, BLIST_TRY_VPD_PAGES |
245
+		BLIST_INQUIRY_36},
243
246
 	{"SMSC", "USB 2 HS-CF", NULL, BLIST_SPARSELUN | BLIST_INQUIRY_36},
244
247
 	{"SONY", "CD-ROM CDU-8001", NULL, BLIST_BORKEN},
245
248
 	{"SONY", "TSL", NULL, BLIST_FORCELUN},		/* DDS3 & DDS4 autoloaders */
..
..
@@ -735,13 +738,12 @@
735
738
 	return err;
736
739
 }
737
740
 
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,
741
+static const struct proc_ops scsi_devinfo_proc_ops = {
742
+	.proc_open	= proc_scsi_devinfo_open,
743
+	.proc_read	= seq_read,
744
+	.proc_write	= proc_scsi_devinfo_write,
745
+	.proc_lseek	= seq_lseek,
746
+	.proc_release	= seq_release,
745
747
 };
746
748
 #endif /* CONFIG_SCSI_PROC_FS */
747
749
 
..
..
@@ -866,7 +868,7 @@
866
868
 	}
867
869
 
868
870
 #ifdef CONFIG_SCSI_PROC_FS
869
-	p = proc_create("scsi/device_info", 0, NULL, &scsi_devinfo_proc_fops);
871
+	p = proc_create("scsi/device_info", 0, NULL, &scsi_devinfo_proc_ops);
870
872
 	if (!p) {
871
873
 		error = -ENOMEM;
872
874
 		goto out;