Attachment 156590 Details for Bug 206123 – patch -- make tcp_recvmsg look for kthread_stop events

[patch] patch -- make tcp_recvmsg look for kthread_stop events

tcp-recvmsg-kthread-stop.patch (text/plain), 1.14 KB, created by Jeff Layton on 2007-06-08 16:55:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2007-06-08 16:55:56 UTC

Size: 1.14 KB

patch

obsolete

>diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
>index bd4c295..1ad91fa 100644
>--- a/net/ipv4/tcp.c
>+++ b/net/ipv4/tcp.c
>@@ -258,6 +258,7 @@
> #include <linux/cache.h>
> #include <linux/err.h>
> #include <linux/crypto.h>
>+#include <linux/kthread.h>
> 
> #include <net/icmp.h>
> #include <net/tcp.h>
>@@ -1154,7 +1155,7 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
> 		if (tp->urg_data && tp->urg_seq == *seq) {
> 			if (copied)
> 				break;
>-			if (signal_pending(current)) {
>+			if (signal_pending(current) || kthread_should_stop()) {
> 				copied = timeo ? sock_intr_errno(timeo) : -EAGAIN;
> 				break;
> 			}
>@@ -1197,6 +1198,7 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
> 			    (sk->sk_shutdown & RCV_SHUTDOWN) ||
> 			    !timeo ||
> 			    signal_pending(current) ||
>+			    kthread_should_stop() ||
> 			    (flags & MSG_PEEK))
> 				break;
> 		} else {
>@@ -1227,7 +1229,7 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
> 				break;
> 			}
> 
>-			if (signal_pending(current)) {
>+			if (signal_pending(current) || kthread_should_stop()) {
> 				copied = sock_intr_errno(timeo);
> 				break;
> 			}

Actions: View | Diff

Attachments on bug 206123: 155742 | 155749 | 155981 | 156590 | 157543