patch-2.1.56 linux/drivers/block/floppy.c

• Lines: 19
• Date: Mon Sep 15 10:04:07 1997
• Orig file: v2.1.55/linux/drivers/block/floppy.c
• Orig date: Sun Sep 7 13:10:42 1997

diff -u --recursive --new-file v2.1.55/linux/drivers/block/floppy.c linux/drivers/block/floppy.c
@@ -3503,7 +3503,7 @@
 	if (!filp || (filp->f_mode & (2 | OPEN_WRITE_BIT)))
 		/* if the file is mounted OR (writable now AND writable at
 		 * open time) Linus: Does this cover all cases? */
-		block_fsync(inode,filp);
+		block_fsync(filp, filp->f_dentry);
 
 	if (UDRS->fd_ref < 0)
 		UDRS->fd_ref=0;
@@ -3865,6 +3865,9 @@
 	{ "allowed_drive_mask", 0, &allowed_drive_mask, 0xff, 0}, /* obsolete */
 	{ "all_drives", 0, &allowed_drive_mask, 0xff, 0 }, /* obsolete */
 	{ "asus_pci", 0, &allowed_drive_mask, 0x33, 0},
+
+	{ "irq", 0, &FLOPPY_IRQ, 6, 0 },
+	{ "dma", 0, &FLOPPY_DMA, 2, 0 },
 
 	{ "daring", daring, 0, 1, 0},