patch-2.1.57 linux/fs/pipe.c

Next file: linux/fs/proc/array.c
Previous file: linux/fs/nfsd/export.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.56/linux/fs/pipe.c linux/fs/pipe.c
@@ -52,7 +52,7 @@
 			if (!PIPE_WRITERS(*inode))
 				return 0;
 		}
-		if (current->signal & ~current->blocked)
+		if (signal_pending(current))
 			return -ERESTARTSYS;
 		interruptible_sleep_on(&PIPE_WAIT(*inode));
 	}
@@ -104,7 +104,7 @@
 				send_sig(SIGPIPE,current,0);
 				return written? :-EPIPE;
 			}
-			if (current->signal & ~current->blocked)
+			if (signal_pending(current))
 				return written? :-ERESTARTSYS;
 			if (filp->f_flags & O_NONBLOCK)
 				return written? :-EAGAIN;

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