From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F16E5C2D0D1 for ; Thu, 19 Dec 2019 18:59:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BD76E2465E for ; Thu, 19 Dec 2019 18:59:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576781966; bh=k0PGHl9AFF8Jmbw1yT7FRXieSApRaycBklTB0R9iL2c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Cz8MuNNC9iWdcwdToF8+vztSwtWSuSFaWXXu5wxaoOnVi/Go1KuH42jvPO7A9ssKV TXyAd3yi9xZ31O7U0nQrImrA7pXrAUhqz4Hl1x86bBqqAm1NI8d/7q/0UY0vYdPHLG KbPYAB7CboC3+7u/NnUvqLeEVA7anD9HMpeGBrx0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728135AbfLSS7W (ORCPT ); Thu, 19 Dec 2019 13:59:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:48620 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730180AbfLSSxa (ORCPT ); Thu, 19 Dec 2019 13:53:30 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A2B7524684; Thu, 19 Dec 2019 18:53:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576781610; bh=k0PGHl9AFF8Jmbw1yT7FRXieSApRaycBklTB0R9iL2c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yhqPHKAry7nP5PrwSRmlgU5pJDAQLdeh97JF1Ai5Lpb3k1h5hu9MnAx5UUb9OUy3i VlInfmEEGvrLUAIBsU5/pgy4l6hkrZ7Iv/cSkVImg/no2KKevzCkBButYgIprTDRym U3SBXnLEovfXS40U4NAzebWW064BiQwFkluIsavc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Long Li , Steve French Subject: [PATCH 4.19 31/47] cifs: smbd: Return -EAGAIN when transport is reconnecting Date: Thu, 19 Dec 2019 19:34:45 +0100 Message-Id: <20191219182934.398750129@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219182857.659088743@linuxfoundation.org> References: <20191219182857.659088743@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Long Li commit 4357d45f50e58672e1d17648d792f27df01dfccd upstream. During reconnecting, the transport may have already been destroyed and is in the process being reconnected. In this case, return -EAGAIN to not fail and to retry this I/O. Signed-off-by: Long Li Cc: stable@vger.kernel.org Signed-off-by: Steve French Signed-off-by: Greg Kroah-Hartman --- fs/cifs/transport.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- a/fs/cifs/transport.c +++ b/fs/cifs/transport.c @@ -286,8 +286,11 @@ __smb_send_rqst(struct TCP_Server_Info * int val = 1; __be32 rfc1002_marker; - if (cifs_rdma_enabled(server) && server->smbd_conn) { - rc = smbd_send(server, num_rqst, rqst); + if (cifs_rdma_enabled(server)) { + /* return -EAGAIN when connecting or reconnecting */ + rc = -EAGAIN; + if (server->smbd_conn) + rc = smbd_send(server, num_rqst, rqst); goto smbd_done; } if (ssocket == NULL)