patch-2.1.118 linux/drivers/block/rd.c

Next file: linux/drivers/block/swim3.c
Previous file: linux/drivers/block/ps2esdi.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.117/linux/drivers/block/rd.c linux/drivers/block/rd.c
@@ -223,6 +223,7 @@
 	NULL, 		/* ioctl */
 	NULL,		/* mmap */
 	NULL,		/* open */
+	NULL,		/* flush */
 	initrd_release,	/* release */
 	NULL		/* fsync */ 
 };
@@ -249,13 +250,11 @@
 	return 0;
 }
 
-#ifdef MODULE
 static int rd_release(struct inode * inode, struct file * filp)
 {
 	MOD_DEC_USE_COUNT;
 	return 0;
 }
-#endif
 
 static struct file_operations fd_fops = {
 	NULL,		/* lseek - default */
@@ -266,11 +265,8 @@
 	rd_ioctl, 	/* ioctl */
 	NULL,		/* mmap */
 	rd_open,	/* open */
-#ifndef MODULE
-	NULL,		/* no special release code... */
-#else
+	NULL,		/* flush */
 	rd_release,	/* module needs to decrement use count */
-#endif
 	block_fsync		/* fsync */ 
 };
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov