mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/ide/ide-floppy.c
..
..
@@ -19,6 +19,7 @@
19
19
 #include <linux/types.h>
20
20
 #include <linux/string.h>
21
21
 #include <linux/kernel.h>
22
+#include <linux/compat.h>
22
23
 #include <linux/delay.h>
23
24
 #include <linux/timer.h>
24
25
 #include <linux/mm.h>
..
..
@@ -276,7 +277,7 @@
276
277
 		switch (ide_req(rq)->type) {
277
278
 		case ATA_PRIV_MISC:
278
279
 		case ATA_PRIV_SENSE:
279
-			pc = (struct ide_atapi_pc *)rq->special;
280
+			pc = (struct ide_atapi_pc *)ide_req(rq)->special;
280
281
 			break;
281
282
 		default:
282
283
 			BUG();
..
..
@@ -427,7 +428,7 @@
427
428
 				 * (maintains previous driver behaviour)
428
429
 				 */
429
430
 				break;
430
-			/* else: fall through */
431
+			fallthrough;
431
432
 		case CAPACITY_CURRENT:
432
433
 			/* Normal Zip/LS-120 disks */
433
434
 			if (memcmp(cap_desc, &floppy->cap_desc, 8))
..
..
@@ -515,8 +516,6 @@
515
516
 	(void) ide_floppy_get_capacity(drive);
516
517
 
517
518
 	ide_proc_register_driver(drive, floppy->driver);
518
-
519
-	drive->dev_flags |= IDE_DFLAG_ATTACH;
520
519
 }
521
520
 
522
521
 static void ide_floppy_flush(ide_drive_t *drive)
..
..
@@ -546,4 +545,7 @@
546
545
 	.set_doorlock	= ide_set_media_lock,
547
546
 	.do_request	= ide_floppy_do_request,
548
547
 	.ioctl		= ide_floppy_ioctl,
548
+#ifdef CONFIG_COMPAT
549
+	.compat_ioctl	= ide_floppy_compat_ioctl,
550
+#endif
549
551
 };