From patchwork Fri Sep 28 07:34:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve French X-Patchwork-Id: 10619095 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 96C0915A7 for ; Fri, 28 Sep 2018 07:34:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 822672AF16 for ; Fri, 28 Sep 2018 07:34:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 748EC2B18D; Fri, 28 Sep 2018 07:34:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C6F42AF16 for ; Fri, 28 Sep 2018 07:34:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728804AbeI1N5P (ORCPT ); Fri, 28 Sep 2018 09:57:15 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:40628 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728739AbeI1N5P (ORCPT ); Fri, 28 Sep 2018 09:57:15 -0400 Received: by mail-pf1-f193.google.com with SMTP id s5-v6so3713656pfj.7 for ; Fri, 28 Sep 2018 00:34:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=18VUOHyl7DOHGwqNnmXZ0XGGR4r1xN6Zb7/mWTHLgY0=; b=O/UEDcAQ/w5q+MHOGo97NFMFr/Qx0Y/2iS+CuUK7eV5YskzhCureZ2+e6OLHNhC2+t xoYXvig2jxvzKfb52q+CQudwceaMykeQr9MBHx12bBrdUxnX2sSy+qG1jPnrY3mV9MVv bkOHlgNyBx6+muVmcsLtc88lW3FL1wbAwX2smKFx85DeiEzfV4sR3nEYQiZNbjFsWB/U aRetPowninHxy+fhfX6WtQUch+wgv0UuGqTZu1QoVPVE2WN1pJDZasLu9u3jnyuN+ETz W7+jDhOfcUJeiZBU3+gFR3UOCzsZORLSEbCgG8xcSKqFtUOaIrStnHcAP42ImYcHLJzc eXmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=18VUOHyl7DOHGwqNnmXZ0XGGR4r1xN6Zb7/mWTHLgY0=; b=DQJSc/eXg1AzHiS2Ike5jX5slmxL1TV+VMhVH+O6sr/L6AA0tQeWrSwbsQJ2BN3/Hy Vt+/TOJhd3vUjEy+uBh6ioDy2bwzVjtI4M/d3q5cKOY2WKCxEFbwvgASgyNt90vTP4zD SlUKGxuPYT2zxU2o1FAJm7ejh2aS6kj5kTRIshDn1GFZ6LtGXA7NCrGBFr/WXYcuLOMs 1hn875S4GL9pfqHhZkoJdWmJlT9A6/T02xgoKhCFtK01n5l4ajjik3Z3S5x3/2/VUjBL IQLmWbn/RDEGUd3NckNeg01qmtI2etCPD38jq8SQAghlGctgj329u6FkFTlC9ta9O/H2 Fg+w== X-Gm-Message-State: ABuFfogl0rzV8DLWn+KedNyAFxdC7UWrVM/y0fxvcOCpMuYh9er9NU9K uOKNiiIjgO52+L7HNH9t4Dm7D60JsxRPUU8dfknji/DF X-Google-Smtp-Source: ACcGV61ZGZ7t/8X+essYnKCY/hxZqjKqn4pjLjjJeWOPNyyov6AKZIQ4ev0JkItNjcwQb2FocO7naf504w3pFOSinLo= X-Received: by 2002:a63:61d0:: with SMTP id v199-v6mr13993322pgb.242.1538120089200; Fri, 28 Sep 2018 00:34:49 -0700 (PDT) MIME-Version: 1.0 From: Steve French Date: Fri, 28 Sep 2018 02:34:37 -0500 Message-ID: Subject: [PATCH] smb3: fix lease break problem introduced by compounding To: CIFS Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fixes problem (discovered by Aurelien) introduced by recent commit: commit b24df3e30cbf48255db866720fb71f14bf9d2f39 ("cifs: update receive_encrypted_standard to handle compounded responses") which broke the ability to respond to some lease breaks (lease breaks being ignored is a problem since can block server response for duration of the lease break timeout). Signed-off-by: Steve French --- fs/cifs/connect.c | 3 +++ 1 file changed, 3 insertions(+) From 74b3197a7431f6f9bbbbbdc193d882d3564f7e72 Mon Sep 17 00:00:00 2001 From: Steve French Date: Fri, 28 Sep 2018 02:11:43 -0500 Subject: [PATCH] smb3: fix lease break problem introducted by compounding Fixes problem introduced by recent commit: commit b24df3e30cbf48255db866720fb71f14bf9d2f39 ("cifs: update receive_encrypted_standard to handle compounded responses") which broke the ability to respond to some lease breaks (lease breaks being ignored is a problem since can block server response for duration of the lease break timeout). Signed-off-by: Steve French --- fs/cifs/connect.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index f765b20985cd..4307d635bc5d 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -969,6 +969,9 @@ cifs_demultiplex_thread(void *p) server->lstrp = jiffies; + if ((num_mids == 0) && (server->ops->is_oplock_break)) + server->ops->is_oplock_break(bufs[0], server); + for (i = 0; i < num_mids; i++) { if (mids[i] != NULL) { mids[i]->resp_buf_size = server->pdu_size; -- 2.17.1