From patchwork Wed Oct 18 23:09:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Long Li X-Patchwork-Id: 10015465 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 0EC34602C8 for ; Wed, 18 Oct 2017 23:12:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 010FD28968 for ; Wed, 18 Oct 2017 23:12:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EA0F428D00; Wed, 18 Oct 2017 23:12:04 +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.4 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 85B6E28968 for ; Wed, 18 Oct 2017 23:12:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751659AbdJRXLL (ORCPT ); Wed, 18 Oct 2017 19:11:11 -0400 Received: from a2nlsmtp01-03.prod.iad2.secureserver.net ([198.71.225.37]:41934 "EHLO a2nlsmtp01-03.prod.iad2.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751077AbdJRXLH (ORCPT ); Wed, 18 Oct 2017 19:11:07 -0400 Received: from linuxonhyperv.com ([107.180.71.197]) by : HOSTING RELAY : with SMTP id 4xT8eRKpdS67i4xT8erQnm; Wed, 18 Oct 2017 16:10:06 -0700 x-originating-ip: 107.180.71.197 Received: from longli by linuxonhyperv.com with local (Exim 4.89) (envelope-from ) id 1e4xT8-0005V5-Bf; Wed, 18 Oct 2017 16:09:46 -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, Tom Talpey , Matthew Wilcox , Stephen Hemminger Cc: Long Li Subject: [Patch v5 08/21] CIFS: SMBD: Upper layer reconnects to SMB Direct session Date: Wed, 18 Oct 2017 16:09:07 -0700 Message-Id: <20171018230920.21042-9-longli@exchange.microsoft.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171018230920.21042-1-longli@exchange.microsoft.com> References: <20171018230920.21042-1-longli@exchange.microsoft.com> X-CMAE-Envelope: MS4wfAlo3/io8Msqmbe1cXtEJ8makNtZzVJsmuw5h4LNwQEsevQ8GijiujwBbkPhXEDQORiMb6jZYClzo4CeOA13M7VZJ5jaRV/cL7Pd8ZyE/fnXCvcz+lf/ g7/fQufYDbCWGTlzooZIKRQ08tPKWKJrMBHKOggqQaFEqN0SuXYKKtAxYEQ2Ktj3VFa0Qbyw3B91P0DiLQ9Fdtb/Ll21IVmwTxsQPLbhJ5iQ2gGYtl5jE6g0 gju2D2Ly/vl1PDhy4HmfkrfUi4TKyqP+tGTV1CbDR33iErKu4H++OLJu2EKhdaGLjYO6ty9750F4ih/J9x3D0Htj2QJu6NX752U05lrYWRmC2WFwXZJ2abww g3WZTnQJx4zcBD8bwRPs6ohh552df7iADfTuvmrf7ct3z9cGKuAA9Ka4PPHXVjTRRUd91iQd79vpjInk4e6Hmvd8osywiC2ga4sCA8VcmqFWp/jpDauc+heq xuZVEa/uj4j3LnVc 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);