diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
| commit | 230e5ab6a084ed50470f101934782dbf54b0d06b (patch) | |
| tree | 5dd821c8d33f450470588e7a543f74bf74306e9e /net/unix | |
| parent | c9b1c8a64c6444d189856f1e26bdcb8b4cd0113a (diff) | |
Merge with Linux 2.1.67.
Diffstat (limited to 'net/unix')
| -rw-r--r-- | net/unix/af_unix.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 8622da797..936d61220 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -705,7 +705,7 @@ static int unix_stream_connect1(struct socket *sock, struct msghdr *msg, if(nonblock) return -EINPROGRESS; interruptible_sleep_on(sk->sleep); - if(current->signal & ~current->blocked) + if(signal_pending(current)) return -ERESTARTSYS; } @@ -802,7 +802,7 @@ static int unix_accept(struct socket *sock, struct socket *newsock, int flags) 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 @@ static int unix_stream_recvmsg(struct socket *sock, struct msghdr *msg, int size 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; |