patch-2.3.10 linux/fs/pipe.c

• Lines: 30
• Date: Tue Jul 6 19:08:33 1999
• Orig file: v2.3.9/linux/fs/pipe.c
• Orig date: Wed Jun 30 13:38:20 1999

diff -u --recursive --new-file v2.3.9/linux/fs/pipe.c linux/fs/pipe.c
@@ -27,7 +27,7 @@
 /* Florian Coosmann (FGC)                                ^ current = 1       */
 /* Additionally, we now use locking technique. This prevents race condition  */
 /* in case of paging and multiple read/write on the same pipe. (FGC)         */
-
+/* Reads with count = 0 should always return 0. Julian Bradfield 1999-06-07. */
 
 static ssize_t do_pipe_read(struct file * filp, char * buf, size_t count)
 {
@@ -144,9 +144,12 @@
 {
 	ssize_t retval;
 
+
 	if (ppos != &filp->f_pos)
 		return -ESPIPE;
 
+	if ( !count ) return 0;
+
 	lock_kernel();
 	retval = do_pipe_read(filp, buf, count);
 	unlock_kernel();
@@ -480,6 +483,7 @@
 	NULL,			/* mknod */
 	NULL,			/* rename */
 	NULL,			/* readlink */
+	NULL,			/* follow_link */
 	NULL,			/* get_block */
 	NULL,			/* readpage */
 	NULL,			/* writepage */