From patchwork Sun Nov 5 05:43:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Long Li X-Patchwork-Id: 10041883 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 73B7160247 for ; Sun, 5 Nov 2017 05:45:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E7EF2962D for ; Sun, 5 Nov 2017 05:45:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5125F29642; Sun, 5 Nov 2017 05:45:59 +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.9 required=2.0 tests=BAYES_00,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 4049E2962D for ; Sun, 5 Nov 2017 05:45:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751007AbdKEFpx (ORCPT ); Sun, 5 Nov 2017 01:45:53 -0400 Received: from a2nlsmtp01-02.prod.iad2.secureserver.net ([198.71.225.36]:51988 "EHLO a2nlsmtp01-02.prod.iad2.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750724AbdKEFpw (ORCPT ); Sun, 5 Nov 2017 01:45:52 -0400 Received: from linuxonhyperv.com ([107.180.71.197]) by : HOSTING RELAY : with SMTP id BDjUeX8U0OdJ4BDjUeZkEJ; Sat, 04 Nov 2017 22:44:51 -0700 x-originating-ip: 107.180.71.197 Received: from longli by linuxonhyperv.com with local (Exim 4.89) (envelope-from ) id 1eBDjU-0006Eu-KC; Sat, 04 Nov 2017 22:44:32 -0700 From: Long Li To: Steve French , linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, Christoph Hellwig , Tom Talpey , Matthew Wilcox , Stephen Hemminger Cc: Long Li Subject: [Patch v6 10/22] CIFS: SMBD: Upper layer reconnects to SMB Direct session Date: Sat, 4 Nov 2017 22:43:52 -0700 Message-Id: <20171105054404.23886-11-longli@exchange.microsoft.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171105054404.23886-1-longli@exchange.microsoft.com> References: <20171105054404.23886-1-longli@exchange.microsoft.com> X-CMAE-Envelope: MS4wfHInzG9HoganxEji0XFIN7xoEuqKZa4XBlKSa/qrrDpMlkjOy4Z5A7Ighy6xCM4m6M/04xKXnffq7FwVkSJPO7Lh1rXP736G8O9KiQZ/Fm6tC1TSfCbJ J5uMJrpbgS8+Ym0vO/kd2gcgqvrqmeEJWE/Pn9ryOx9WguD764fehIRX3HKtWU8p19AmC4O8wv4yBX7NCAbsrby5ocIU+/I6A3JVQsocjHCt9LDVnEz9jCwW C7kmmEcOTy/TFfG7FxFej/WG9ZoSqOQDf1duLJAGR6lUfQP/tAJSB3YotLZ/rcpsFtMiRMd+w7jBwhFwytx7MYJHH7qUtbHhDIOk0vtIXH6dy0QOnq+CBl9Z cSLai0b/G9AOynjKKJhX/kB5Vg8XAeZNDimRyLAiiqNJYCJBb6xBjoFUUNqKoIFXr1gjl3Q8QUVkNf/r6JlsMkmHxhHVkrXoEyFPaq6CPGHa00yEHI1/mrEi GomLwswJfCyTBmTu3Xn5+CwYNlnWGs9L3FTVog== 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 From: Long Li Do a reconnect on SMB Direct when it is used as the connection. Reconnect can happen for many reasons and it's mostly the decision of SMB2 upper layer. Signed-off-by: Long Li --- fs/cifs/connect.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 2c0b34a..8ca3c13 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -406,7 +406,14 @@ cifs_reconnect(struct TCP_Server_Info *server) /* we should try only the port we connected to before */ mutex_lock(&server->srv_mutex); +#ifdef CONFIG_CIFS_SMB_DIRECT + if (server->rdma) + rc = smbd_reconnect(server); + else + rc = generic_ip_connect(server); +#else rc = generic_ip_connect(server); +#endif if (rc) { cifs_dbg(FYI, "reconnect error %d\n", rc); mutex_unlock(&server->srv_mutex);