From patchwork Tue Feb 8 23:50:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve French X-Patchwork-Id: 542471 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p18Nnqmt000648 for ; Tue, 8 Feb 2011 23:50:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755786Ab1BHXuf (ORCPT ); Tue, 8 Feb 2011 18:50:35 -0500 Received: from mail-bw0-f46.google.com ([209.85.214.46]:44016 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752924Ab1BHXuf convert rfc822-to-8bit (ORCPT ); Tue, 8 Feb 2011 18:50:35 -0500 Received: by bwz15 with SMTP id 15so388258bwz.19 for ; Tue, 08 Feb 2011 15:50:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=nJON4AI+R6DLR0tGYtOWlcbNLowq6k3z1/GQQBAYIEc=; b=auL4WtuxZHFwQOziEVp/wYxWPZnvX1aXUUSBpHeAo83ocq380kD7FyyzziHdGVj3er 9cyWK9DsMcfBrj1wEFr7o8J5F6Vdd36J/+qp6OK+MM9WnvWi6LtEEdrN2MLEAztIJ3KF 3b42xtxGBmi+0G6iYp0oX5lUPzJJiVRwp+eQs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=Mg8ySPEFUFnvAKCYEAlBxWiyPRJiURaiJM49IsksP1DX9N4yZjV0JRroxiq4Pgr6JP V1THo2VNvOHMFAOgQbkkdCqlVLU0ZdNG4P8G6naoOzXD1vlNzfiT8yatCkoMlm1W8Kfu idb2WcbKSa78uO14MaYbMb//9+sY6iYRXy8/s= MIME-Version: 1.0 Received: by 10.204.52.75 with SMTP id h11mr18402278bkg.67.1297209033614; Tue, 08 Feb 2011 15:50:33 -0800 (PST) Received: by 10.204.51.71 with HTTP; Tue, 8 Feb 2011 15:50:33 -0800 (PST) In-Reply-To: <1297086876-19165-3-git-send-email-jlayton@redhat.com> References: <1297086876-19165-1-git-send-email-jlayton@redhat.com> <1297086876-19165-3-git-send-email-jlayton@redhat.com> Date: Tue, 8 Feb 2011 17:50:33 -0600 Message-ID: Subject: Re: [PATCH 2/2] cifs: clarify the meaning of tcpStatus == CifsGood From: Steve French To: Jeff Layton Cc: linux-cifs@vger.kernel.org, jg@cms.ac Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 08 Feb 2011 23:50:36 +0000 (UTC) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 257b6d8..10011e9 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -341,7 +341,7 @@ cifs_echo_request(struct work_struct *work) * We cannot send an echo until the NEGOTIATE_PROTOCOL request is done. * Also, no need to ping if we got a response recently */ - if (server->tcpStatus != CifsGood || + if ((server->tcpStatus != CifsGood) || (server->maxBuf == 0) || time_before(jiffies, server->lstrp + SMB_ECHO_INTERVAL - HZ)) goto requeue_echo;