From patchwork Fri Jun 24 04:30:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve French X-Patchwork-Id: 9196581 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 170196075F for ; Fri, 24 Jun 2016 04:31:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0B94D2848B for ; Fri, 24 Jun 2016 04:31:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F2E6128490; Fri, 24 Jun 2016 04:31:34 +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=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 7FCFE2848B for ; Fri, 24 Jun 2016 04:31:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751104AbcFXEba (ORCPT ); Fri, 24 Jun 2016 00:31:30 -0400 Received: from mail-oi0-f66.google.com ([209.85.218.66]:32834 "EHLO mail-oi0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751249AbcFXEba (ORCPT ); Fri, 24 Jun 2016 00:31:30 -0400 Received: by mail-oi0-f66.google.com with SMTP id w141so16198489oia.0 for ; Thu, 23 Jun 2016 21:31:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hLPSjIxlPMy1cKqrSA0vdZDVb0It4tdTwV43nTuXmFE=; b=CN1X/BhJTYTm9SGx+xXP4U7Dpmd8++7ZZMnP6jAAqvuEiqDJM6p8SopLTqLxXIEsH4 IQ0h12Q2a6MVUfjC3MIG8zCq58/nPj9kd0uYEB+wuTLj3WmkOCscX3JBr/SO4gGXhNzO VBGKIJ1kXlSZKLqS4k5mguEB7LdTCGluQ+UzAOHJ4xx8GlZLZhPaIygu5uK/m0oj1Okr en5V73lkd/EDbxi2pveZQ1z0+M7QQ7eGsHvVNdngWpQJnewkVR+Y0yfK9d6MS980KhYV BW0w8dH28TT3Io6LEasfSV6ZYU6ZFT1r5jc8WupWSmhDcW8KbdqQmDZDxo8txP2pM6FT stXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hLPSjIxlPMy1cKqrSA0vdZDVb0It4tdTwV43nTuXmFE=; b=A0ywQU5XWTkGWcw/ZbVNco2DB240RVffPTrF1otdboq/a3rvg7jeDSRLaX+HFu2sVy xnEnXhicEjdnPfxrXsszl17QClnUclM+PBH01O+gGGay8BDz3xtu/epJ8P32wwxTVJPE WaxqksOOwXJkEvRH+LGPcB9VnrZjt+KdUc8YICHMBCXwzqoOEGFTZX0urEo8sdt3Tu3/ w3OcP1ThfVJSJQA7xst0J2GHbkNczgMf28X8rNPVUv8NJL3bc8ojl7mGoPi+YCqh6WCo wdWoiu3noSNfyv9yTXUQXUX3tM51pv6FAtzuH06iIpOXDvKoKApZk5DuYhcrHS/Lm0PP 37vQ== X-Gm-Message-State: ALyK8tI8aZKocbjRAs7t7RNKNJMH3X/KfCN3Fs9q0MArZfuXjZDm/IFkYczsuiKDr5K3Ig== X-Received: by 10.202.54.67 with SMTP id d64mr1332292oia.96.1466742689346; Thu, 23 Jun 2016 21:31:29 -0700 (PDT) Received: from localhost.localdomain (50-204-144-114-static.hfc.comcastbusiness.net. [50.204.144.114]) by smtp.gmail.com with ESMTPSA id v64sm1986157oie.5.2016.06.23.21.31.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 23 Jun 2016 21:31:28 -0700 (PDT) From: Steve French To: linux-cifs@vger.kernel.org Cc: Steve French , Steve French Subject: [PATCH 2/2] [SMB3] Avoid possible deadlock in previous patch Date: Thu, 23 Jun 2016 23:30:47 -0500 Message-Id: <1466742647-9805-2-git-send-email-smfrench@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466742647-9805-1-git-send-email-smfrench@gmail.com> References: <1466742647-9805-1-git-send-email-smfrench@gmail.com> 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 Signed-off-by: Steve French --- fs/cifs/smb2pdu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index 4030cbd..f2cbb28 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -1831,8 +1831,11 @@ SMB2_echo(struct TCP_Server_Info *server) tcon = list_entry(tmp2, struct cifs_tcon, tcon_list); /* add check for persistent handle reconnect */ - if (tcon && tcon->need_reconnect) + if (tcon && tcon->need_reconnect) { + spin_unlock(&cifs_tcp_ses_lock); rc = smb2_reconnect(SMB2_ECHO, tcon); + spin_lock(&cifs_tcp_ses_lock); + } } } spin_unlock(&cifs_tcp_ses_lock);