patch-2.1.57 linux/net/unix/af_unix.c

Next file: linux/net/x25/af_x25.c
Previous file: linux/net/sunrpc/clnt.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.56/linux/net/unix/af_unix.c linux/net/unix/af_unix.c
@@ -705,7 +705,7 @@
 		if(nonblock)
 			return -EINPROGRESS;
 		interruptible_sleep_on(sk->sleep);
-		if(current->signal & ~current->blocked)
+		if(signal_pending(current))
 			return -ERESTARTSYS;
 	}
 	
@@ -802,7 +802,7 @@
 			if(flags&O_NONBLOCK)
 				return -EAGAIN;
 			interruptible_sleep_on(sk->sleep);
-			if(current->signal & ~current->blocked)
+			if(signal_pending(current))
 				return -ERESTARTSYS;
 			continue;
 		}
@@ -1219,7 +1219,7 @@
 			if (noblock)
 				return -EAGAIN;
 			unix_data_wait(sk);
-			if (current->signal & ~current->blocked)
+			if (signal_pending(current))
 				return -ERESTARTSYS;
 			down(&sk->protinfo.af_unix.readsem);
 			continue;

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