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

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

diff -u --recursive --new-file v2.1.53/linux/drivers/char/mem.c linux/drivers/char/mem.c
@@ -339,13 +339,6 @@
 	return 0;
 }
 
-static long read_full(struct inode * node, struct file * file,
-	char * buf, unsigned long count)
-{
-	file->f_pos += count;
-	return count;
-}
-
 static long write_full(struct inode * inode, struct file * file,
 	const char * buf, unsigned long count)
 {
@@ -390,7 +383,9 @@
 
 #define mmap_kmem	mmap_mem
 #define zero_lseek	null_lseek
+#define full_lseek      null_lseek
 #define write_zero	write_null
+#define read_full       read_zero
 
 static struct file_operations mem_fops = {
 	memory_lseek,
@@ -457,7 +452,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