Attachment 89236 Details for Bug 153295

[patch] this may help...

delme (text/plain), 2.63 KB, created by Pavel Machek on 2006-06-13 19:57:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Machek

Created: 2006-06-13 19:57:34 UTC

Size: 2.63 KB

patch

obsolete

>diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
>index c262d88..f32fe05 100644
>--- a/fs/cifs/cifsfs.c
>+++ b/fs/cifs/cifsfs.c
>@@ -905,7 +905,7 @@ static int cifs_dnotify_thread(void * du
> 	struct cifsSesInfo *ses;
> 
> 	do {
>-		if(try_to_freeze())
>+		if (try_to_freeze())
> 			continue;
> 		set_current_state(TASK_INTERRUPTIBLE);
> 		schedule_timeout(15*HZ);
>diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
>index bae1479..1c2849d 100644
>--- a/fs/cifs/connect.c
>+++ b/fs/cifs/connect.c
>@@ -369,21 +369,21 @@ cifs_demultiplex_thread(struct TCP_Serve
> 			continue;
> 		if (bigbuf == NULL) {
> 			bigbuf = cifs_buf_get();
>-			if(bigbuf == NULL) {
>-				cERROR(1,("No memory for large SMB response"));
>+			if (!bigbuf) {
>+				cERROR(1, ("No memory for large SMB response"));
> 				msleep(3000);
> 				/* retry will check if exiting */
> 				continue;
> 			}
>-		} else if(isLargeBuf) {
>-			/* we are reusing a dirtry large buf, clear its start */
>+		} else if (isLargeBuf) {
>+			/* we are reusing a dirty large buf, clear its start */
> 			memset(bigbuf, 0, sizeof (struct smb_hdr));
> 		}
> 
> 		if (smallbuf == NULL) {
> 			smallbuf = cifs_small_buf_get();
>-			if(smallbuf == NULL) {
>-				cERROR(1,("No memory for SMB response"));
>+			if (!smallbuf) {
>+				cERROR(1, ("No memory for SMB response"));
> 				msleep(1000);
> 				/* retry will check if exiting */
> 				continue;
>@@ -403,12 +403,12 @@ cifs_demultiplex_thread(struct TCP_Serve
> 		    kernel_recvmsg(csocket, &smb_msg,
> 				 &iov, 1, 4, 0 /* BB see socket.h flags */);
> 
>-		if(server->tcpStatus == CifsExiting) {
>+		if (server->tcpStatus == CifsExiting) {
> 			break;
> 		} else if (server->tcpStatus == CifsNeedReconnect) {
>-			cFYI(1,("Reconnect after server stopped responding"));
>+			cFYI(1, ("Reconnect after server stopped responding"));
> 			cifs_reconnect(server);
>-			cFYI(1,("call to reconnect done"));
>+			cFYI(1, ("call to reconnect done"));
> 			csocket = server->ssocket;
> 			continue;
> 		} else if ((length == -ERESTARTSYS) || (length == -EAGAIN)) {
>@@ -417,15 +417,15 @@ cifs_demultiplex_thread(struct TCP_Serve
> 				tcpStatus CifsNeedReconnect if server hung */
> 			continue;
> 		} else if (length <= 0) {
>-			if(server->tcpStatus == CifsNew) {
>-				cFYI(1,("tcp session abend after SMBnegprot"));
>+			if (server->tcpStatus == CifsNew) {
>+				cFYI(1, ("tcp session abend after SMBnegprot"));
> 				/* some servers kill the TCP session rather than
> 				   returning an SMB negprot error, in which
> 				   case reconnecting here is not going to help,
> 				   and so simply return error to mount */
> 				break;
> 			}
>-			if(length == -EINTR) { 
>+			if (!try_to_freeze() && (length == -EINTR)) {
> 				cFYI(1,("cifsd thread killed"));
> 				break;
> 			}

Actions: View | Diff

Attachments on bug 153295: 89236