Attachment 283141 Details for Bug 417961 – patch 5 -- Fix spurious reconnect on 2nd peek from read of SMB length

[patch] patch 5 -- Fix spurious reconnect on 2nd peek from read of SMB length

0005-BZ-417961-CIFS-Fix-spurious-reconnect-on-2nd-peek.patch (text/plain), 1.29 KB, created by Jeff Layton on 2007-12-10 20:20:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2007-12-10 20:20:11 UTC

Size: 1.29 KB

patch

obsolete

>From 3ee5c7c2d655a5647f89f8aac03b19641959e30e Mon Sep 17 00:00:00 2001
>From: Petr Tesarik <ptesarik@suse.cz>
>Date: Tue, 20 Nov 2007 02:24:08 +0000
>Subject: [RHEL5.2 PATCH 05/16] BZ#417961: [CIFS] Fix spurious reconnect on 2nd peek from read of SMB length
>
>When retrying kernel_recvmsg() because of a short read, check returned
>length against the remaining length, not against total length. This
>avoids unneeded session reconnects which would otherwise occur when
>kernel_recvmsg() finally returns zero when asked to read zero bytes.
>
>Signed-off-by: Petr Tesarik <ptesarik@suse.cz>
>Signed-off-by: Jeff Layton <jlayton@redhat.com>
>Signed-off-by: Steve French <sfrench@us.ibm.com>
>---
> fs/cifs/connect.c |    6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
>index 5f588a8..4f787c3 100644
>--- a/fs/cifs/connect.c
>+++ b/fs/cifs/connect.c
>@@ -484,9 +484,9 @@ incomplete_rcv:
> 			csocket = server->ssocket;
> 			wake_up(&server->response_q);
> 			continue;
>-		} else if (length < 4) {
>-			cFYI(1, ("less than four bytes received (%d bytes)",
>-			      length));
>+		} else if (length < pdu_length) {
>+			cFYI(1, ("requested %d bytes but only got %d bytes",
>+				  pdu_length, length));
> 			pdu_length -= length;
> 			msleep(1);
> 			goto incomplete_rcv;
>-- 
>1.5.3.3
>

Actions: View | Diff

Attachments on bug 417961: 283091 | 283101 | 283111 | 283121 | 283131 | 283141 | 283151 | 283161 | 283171 | 283181 | 283191 | 283201 | 283211 | 283221 | 283231 | 283241 | 283251