Attachment 155981 Details for Bug 206123 – patch -- make cifsd be more signal-safe

[patch] patch -- make cifsd be more signal-safe

linux-2.6.18-cifsd-signal-safe.patch (text/plain), 1.60 KB, created by Jeff Layton on 2007-06-02 12:46:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2007-06-02 12:46:23 UTC

Size: 1.60 KB

patch

obsolete

>diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
>index 9009d59..4b4071a 100644
>--- a/fs/cifs/connect.c
>+++ b/fs/cifs/connect.c
>@@ -210,6 +210,12 @@ cifs_reconnect(struct TCP_Server_Info *server)
> 					server->server_RFC1001_name);
> 		}
> 		if(rc) {
>+			if (rc == -ERESTARTSYS) {
>+				cFYI(1,("reconnect interrupted by signal"));
>+				flush_signals(server->tsk);
>+				msleep(1);  /* let kthread_stop catch up */
>+				continue;
>+			}
> 			cFYI(1,("reconnect error %d",rc));
> 			msleep(3000);
> 		} else {
>@@ -465,8 +471,14 @@ cifs_demultiplex_thread(struct TCP_Server_Info *server)
> #else
> 			if (length == -EINTR) {
> #endif
>-				cFYI(1,("cifsd thread killed"));
>-				break;
>+				if (server->tcpStatus == CifsExiting) {
>+					cFYI(1,("cifsd thread killed"));
>+					break;
>+				} else {
>+					cFYI(1,("cifsd caught spurious signal, ignoring it"));
>+					flush_signals(server->tsk);
>+					continue;
>+				}
> 			}
> 			cFYI(1,("Reconnect after unexpected peek error %d",
> 				length));
>@@ -571,11 +583,14 @@ cifs_demultiplex_thread(struct TCP_Server_Info *server)
> 			length = kernel_recvmsg(csocket, &smb_msg, &iov, 1,
> 						pdu_length - total_read, 0);
> #endif
>-			if((server->tcpStatus == CifsExiting) ||
>-			    (length == -EINTR)) {
>+			if (server->tcpStatus == CifsExiting) {
> 				/* then will exit */
> 				reconnect = 2;
> 				break;
>+			} else if (length == -EINTR) {
>+				cFYI(1,("cifsd caught spurious signal, ignoring it"));
>+				flush_signals(server->tsk);
>+				continue;
> 			} else if (server->tcpStatus == CifsNeedReconnect) {
> 				cifs_reconnect(server);
> 				csocket = server->ssocket;
>diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c

Actions: View | Diff

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