patch-2.0.31 linux/drivers/char/mem.c

Next file: linux/drivers/char/misc.c
Previous file: linux/drivers/char/keyboard.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.0.30/linux/drivers/char/mem.c linux/drivers/char/mem.c
@@ -194,12 +194,6 @@
 	return 0;
 }
 
-static int read_full(struct inode * node, struct file * file, char * buf,int count)
-{
-	file->f_pos += count;
-	return count;
-}
-
 static int write_full(struct inode * inode, struct file * file, const char * buf, int count)
 {
 	return -ENOSPC;
@@ -242,7 +236,9 @@
 #define write_kmem	write_mem
 #define mmap_kmem	mmap_mem
 #define zero_lseek	null_lseek
+#define full_lseek	null_lseek
 #define write_zero	write_null
+#define read_full	read_null
 
 static struct file_operations ram_fops = {
 	memory_lseek,
@@ -322,7 +318,7 @@
 };
 
 static struct file_operations full_fops = {
-	memory_lseek,
+	full_lseek,
 	read_full,
 	write_full,
 	NULL,		/* full_readdir */

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