From patchwork Tue Nov 7 08:55:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Long Li X-Patchwork-Id: 835198 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-cifs-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yWNmP26CZz9s74 for ; Tue, 7 Nov 2017 20:04:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753120AbdKGI5I (ORCPT ); Tue, 7 Nov 2017 03:57:08 -0500 Received: from a2nlsmtp01-02.prod.iad2.secureserver.net ([198.71.225.36]:34052 "EHLO a2nlsmtp01-02.prod.iad2.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751944AbdKGI5G (ORCPT ); Tue, 7 Nov 2017 03:57:06 -0500 Received: from linuxonhyperv.com ([107.180.71.197]) by : HOSTING RELAY : with SMTP id BzfqebZ9aOdJ4BzfqeYoow; Tue, 07 Nov 2017 01:56:05 -0700 x-originating-ip: 107.180.71.197 Received: from longli by linuxonhyperv.com with local (Exim 4.89) (envelope-from ) id 1eBzfq-0003LD-Ga; Tue, 07 Nov 2017 01:55:58 -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 v7 10/22] CIFS: SMBD: Upper layer reconnects to SMB Direct session Date: Tue, 7 Nov 2017 01:55:02 -0700 Message-Id: <20171107085514.12693-11-longli@exchange.microsoft.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171107085514.12693-1-longli@exchange.microsoft.com> References: <20171107085514.12693-1-longli@exchange.microsoft.com> X-CMAE-Envelope: MS4wfKipmAxzaSlp55LBvBksFMnxPMQdG6tce0Ixn5uJyuzfMTeqNVvXxCp76VOOd7eUlpiUEA0woNYacwMxi8UhcZzEATfMY43kHUw8iyMsctgWtqI6K7bt iIXbOSrad7KDTHKphDTODRcliR07nw9D+TGCMF7LwZIEtHkjwuy1t/xsHDfV1tPlolIN80WaeLWiCk1PrmHJWGw/IQzrDCCfVGJsl6VtpakehnKuv8BbOaW1 NtcNO2LnpTqOBYfmiNNvGRKHl0zyG+TVgFccUOWLYM8wArjceKBCB7n7P4h0aFEyLZ+P6NapJe5ZItVCMaDOquxX0DBtJ39UTOG22QvtMsw+Hvivm4CVYbrj zsVvIaQyhPV6C7XQF0AjtgDSU6st5ube6geb3ucMM688OVLC6H3+Zy81D7p3UkebyR+kT74MqbxrDt/h0naYRpVVem+FEzvaqe7UBmf8GR/1eNu5xi8sfA7W gWtlj310c04I6ulsLLMJOhK9di1fq+X1sEVbog== Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org 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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 75eb50b..3ccd703 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -404,7 +404,10 @@ cifs_reconnect(struct TCP_Server_Info *server) /* we should try only the port we connected to before */ mutex_lock(&server->srv_mutex); - rc = generic_ip_connect(server); + if (cifs_rdma_enabled(server)) + rc = smbd_reconnect(server); + else + rc = generic_ip_connect(server); if (rc) { cifs_dbg(FYI, "reconnect error %d\n", rc); mutex_unlock(&server->srv_mutex);