From patchwork Wed Jun 7 20:33:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rishabh Bhatnagar X-Patchwork-Id: 104725 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp499034vqr; Wed, 7 Jun 2023 14:43:10 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7n3KyyJ55uRlqSgDH1JVJ9uAMLXJMFJdyydvmnOp7S54Fr98aJBm2iu4wl1Y5gxgd8lAf6 X-Received: by 2002:a17:90a:a78e:b0:253:42cc:8c46 with SMTP id f14-20020a17090aa78e00b0025342cc8c46mr3927012pjq.10.1686174189803; Wed, 07 Jun 2023 14:43:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686174189; cv=none; d=google.com; s=arc-20160816; b=mOuA2RDTuaI47hHWylSnxr1UxNEzpOGuHVuYn0nbZQDbFtmhOvNUKdlsLX84AbImG1 pH388EGB1kFnMaKwtBxkZcoQyq3BQ9H7JEF28RogADYKi6yyHn2TAmSMIJMJ11yfKJ7m WBCX8r8qv4AGN69NlBLBOOeeQkCe1YGIqehrc84alYCGpPC0xrFOKBezVvS/ZZgpzdtk AAziZ2hlhlbxdFBJTm8rvGN3GCuVgRVEoPDblOw3KGJ+rm84ZL2Zp3G36ZOkIcoKKfoF DpoVv1igdNB6cfO3eWAZgLPdSx/5AEVLQc5s8kJsjlb+ZHBZX7E/uuZFZh9fJ9B83zYv Q8Rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9Xz9nGSy0yeRWGlp2DV6RWzFo2eunHtyb2l98NdWpAM=; b=Wh+RPT1FOlxwwIComx95/F7sleCevN3xlzWRg+krcXvJqEPCmwz6fqiw+7TeZjknBz /fQk9IaU6tGzs+zcAFT7S6N+KT/jinBFHD3xInJ4W7NKQHfb4xCzNQOFJftJDxCNgYdi k75VNzAFJCxEi1h4jlsUlSqPY/5+T/xSwYk6QZvvP7+GN/6Z3CMmcTKlO5i65GHiBO3D bD/iRvtaT5qO+INyh2VN+ndBb3BWKZt5AAFU7tBSQGRApyG3r6O5K3uIvJmY4PLfQyNo CIGs907de0ICrrYOgqfhrucH8xfwe745LTQB+MJRijRVkt1jt/ge3XLdh/tj7Y7NVMo3 H87g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amazon.com header.s=amazon201209 header.b=g8BacUWT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q8-20020a637508000000b0054405493a4dsi2284171pgc.199.2023.06.07.14.42.55; Wed, 07 Jun 2023 14:43:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@amazon.com header.s=amazon201209 header.b=g8BacUWT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233803AbjFGUdk (ORCPT + 99 others); Wed, 7 Jun 2023 16:33:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233797AbjFGUdg (ORCPT ); Wed, 7 Jun 2023 16:33:36 -0400 Received: from smtp-fw-80006.amazon.com (smtp-fw-80006.amazon.com [99.78.197.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4363184; Wed, 7 Jun 2023 13:33:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1686170016; x=1717706016; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=9Xz9nGSy0yeRWGlp2DV6RWzFo2eunHtyb2l98NdWpAM=; b=g8BacUWTCT26mFG/aQTqSOFU4RxZ3Ne8jw8lT7Ixc8cbOnDZ+XN3ya7z b+qV2WZuIL378n8+YVDJqD45SsKlREVtg0Y7ll7fBbaeHNktMmDGLDLVj rC7zGt5kOCQOBGiU/bf8kkTIw2ef0LfenIxjb02tTcDo4z3Euh3JqpRKI U=; X-IronPort-AV: E=Sophos;i="6.00,225,1681171200"; d="scan'208";a="219334614" Received: from pdx4-co-svc-p1-lb2-vlan2.amazon.com (HELO email-inbound-relay-pdx-2b-m6i4x-7fa2de02.us-west-2.amazon.com) ([10.25.36.210]) by smtp-border-fw-80006.pdx80.corp.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jun 2023 20:33:35 +0000 Received: from EX19MTAUWA002.ant.amazon.com (pdx1-ws-svc-p6-lb9-vlan3.pdx.amazon.com [10.236.137.198]) by email-inbound-relay-pdx-2b-m6i4x-7fa2de02.us-west-2.amazon.com (Postfix) with ESMTPS id 09A4F413EE; Wed, 7 Jun 2023 20:33:34 +0000 (UTC) Received: from EX19D002UWA001.ant.amazon.com (10.13.138.247) by EX19MTAUWA002.ant.amazon.com (10.250.64.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Wed, 7 Jun 2023 20:33:34 +0000 Received: from EX19MTAUWC001.ant.amazon.com (10.250.64.145) by EX19D002UWA001.ant.amazon.com (10.13.138.247) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Wed, 7 Jun 2023 20:33:34 +0000 Received: from dev-dsk-risbhat-2b-8bdc64cd.us-west-2.amazon.com (10.189.73.169) by mail-relay.amazon.com (10.250.64.145) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Wed, 7 Jun 2023 20:33:34 +0000 Received: by dev-dsk-risbhat-2b-8bdc64cd.us-west-2.amazon.com (Postfix, from userid 22673075) id 559152594; Wed, 7 Jun 2023 20:33:34 +0000 (UTC) From: Rishabh Bhatnagar To: CC: , , , , Paulo Alcantara , Aurelien Aptel , Steve French , Rishabh Bhatnagar Subject: [PATCH v2 5.4 1/2] cifs: get rid of unused parameter in reconn_setup_dfs_targets() Date: Wed, 7 Jun 2023 20:33:32 +0000 Message-ID: <20230607203333.26669-2-risbhat@amazon.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230607203333.26669-1-risbhat@amazon.com> References: <20230607203333.26669-1-risbhat@amazon.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768081787385768318?= X-GMAIL-MSGID: =?utf-8?q?1768081787385768318?= From: Paulo Alcantara commit baf3f08ef4083b76ca67b143e135213a7f941879 upstream. The target iterator parameter "it" is not used in reconn_setup_dfs_targets(), so just remove it. Signed-off-by: Paulo Alcantara (SUSE) Reviewed-by: Aurelien Aptel Signed-off-by: Steve French Signed-off-by: Rishabh Bhatnagar --- fs/cifs/connect.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 6c8dd7c0b83a..b5cd3dc479ce 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -469,8 +469,7 @@ static void reconn_inval_dfs_target(struct TCP_Server_Info *server, } static inline int reconn_setup_dfs_targets(struct cifs_sb_info *cifs_sb, - struct dfs_cache_tgt_list *tl, - struct dfs_cache_tgt_iterator **it) + struct dfs_cache_tgt_list *tl) { if (!cifs_sb->origin_fullpath) return -EOPNOTSUPP; @@ -515,7 +514,7 @@ cifs_reconnect(struct TCP_Server_Info *server) } else { cifs_sb = CIFS_SB(sb); - rc = reconn_setup_dfs_targets(cifs_sb, &tgt_list, &tgt_it); + rc = reconn_setup_dfs_targets(cifs_sb, &tgt_list); if (rc && (rc != -EOPNOTSUPP)) { cifs_server_dbg(VFS, "%s: no target servers for DFS failover\n", __func__); From patchwork Wed Jun 7 20:33:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rishabh Bhatnagar X-Patchwork-Id: 104719 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp498667vqr; Wed, 7 Jun 2023 14:42:17 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5KgSa3USZh077uxrn1sareH4lHVcoMTPOiq1LbGOVsWrqszuqn3Ke1HmBCLNuaK7S9qyLP X-Received: by 2002:a17:903:32ce:b0:1b0:4883:2e03 with SMTP id i14-20020a17090332ce00b001b048832e03mr3412636plr.40.1686174137192; Wed, 07 Jun 2023 14:42:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686174137; cv=none; d=google.com; s=arc-20160816; b=WymMUm8Ki8UoPmYdTBePGOIi5D49RaRGrplDsHq6v4dlDLVnBbpS3Xh8/x6Aba6kNH gEpKI532rSyAG16+0s24dnvwuM4dhVZASPWWtCZ+fqdRlOxpCR24qcv2SxDGt2ZuMhlU X7oMB5SrgLEH4YBnRIHPuj7Jx5GZboNzZo4KRTiRkoAc8vAeJvgvWDedMCXdT6AWMzGd Miqp84VcO+GuTvesyVGdtBYKD8paIbtR97EIG/zgItfKcUl/fK3nyUvmBOXz7l3v7UXK T1r0hEInK9Lv/9dVTKYpV1GRyikpivf1pMYZ7+ki9LCt0lKJbcAoBwAmM+sm27m/UiXw 3G5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=eua5jDRET5Qb3t5nMSLO71rB3j2AsP15aUyCua1keY8=; b=EqhVg7PXiJUkOOHbQctkGEnCvJHuZz9C3drWvf9vhvOEqvOv99qzu/DVhL7q6/s71J 1wKfnNkP8K02mLE7rPEJ5sln91wqWaKyUuJSgNW+W4vtZijFaxBCRKl649YXypbHVVE5 yKnSMtNN6RvhTAdaFVlSFTcuFi2vDSRM+iPLp8IKGzS83fSj0b8/E061RL5PV2mpt92K S4tAi35Dq5uQddTn/Fw4en8oENVsQtkv2yWzB75RUCieF+LDONjh7eAVmqPCFu2vDIjp QCzZlHbTrOdTwVTAKrYGQTB1xdPK+PmA+3Fns19Kz+YJkMMFNB6oiUQ2kRRSoBJCp+Bn /U9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amazon.com header.s=amazon201209 header.b=NiPbH8o5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lp2-20020a17090b4a8200b00259aa539533si1658670pjb.105.2023.06.07.14.42.01; Wed, 07 Jun 2023 14:42:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@amazon.com header.s=amazon201209 header.b=NiPbH8o5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233852AbjFGUdp (ORCPT + 99 others); Wed, 7 Jun 2023 16:33:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233828AbjFGUdl (ORCPT ); Wed, 7 Jun 2023 16:33:41 -0400 Received: from smtp-fw-52002.amazon.com (smtp-fw-52002.amazon.com [52.119.213.150]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6C951706; Wed, 7 Jun 2023 13:33:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1686170020; x=1717706020; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eua5jDRET5Qb3t5nMSLO71rB3j2AsP15aUyCua1keY8=; b=NiPbH8o5plkvTC0y6zVqzZ65lRCFTZJnU5C0dE4NP0LKbm2RVVvt+yI4 L3pa8lqMAqueG4fwl3ruaYehbzqKJ9ppmGXAuwVajwMvyF3yNcb0ga95h Ki6xzoH2FefddpYbk0vC8t8YxElTn8IU38bByHCKimHBqQDr0oVqmlIRm 0=; X-IronPort-AV: E=Sophos;i="6.00,225,1681171200"; d="scan'208";a="565509297" Received: from iad12-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-iad-1d-m6i4x-25ac6bd5.us-east-1.amazon.com) ([10.43.8.6]) by smtp-border-fw-52002.iad7.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jun 2023 20:33:39 +0000 Received: from EX19MTAUWB001.ant.amazon.com (iad12-ws-svc-p26-lb9-vlan2.iad.amazon.com [10.40.163.34]) by email-inbound-relay-iad-1d-m6i4x-25ac6bd5.us-east-1.amazon.com (Postfix) with ESMTPS id 4FD9E45CA1; Wed, 7 Jun 2023 20:33:37 +0000 (UTC) Received: from EX19D002UWA003.ant.amazon.com (10.13.138.235) by EX19MTAUWB001.ant.amazon.com (10.250.64.248) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Wed, 7 Jun 2023 20:33:35 +0000 Received: from EX19MTAUEB001.ant.amazon.com (10.252.135.35) by EX19D002UWA003.ant.amazon.com (10.13.138.235) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Wed, 7 Jun 2023 20:33:34 +0000 Received: from dev-dsk-risbhat-2b-8bdc64cd.us-west-2.amazon.com (10.189.73.169) by mail-relay.amazon.com (10.252.135.35) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Wed, 7 Jun 2023 20:33:34 +0000 Received: by dev-dsk-risbhat-2b-8bdc64cd.us-west-2.amazon.com (Postfix, from userid 22673075) id 58D96273E; Wed, 7 Jun 2023 20:33:34 +0000 (UTC) From: Rishabh Bhatnagar To: CC: , , , , Paulo Alcantara , Aurelien Aptel , Steve French , Rishabh Bhatnagar Subject: [PATCH v2 5.4 2/2] cifs: handle empty list of targets in cifs_reconnect() Date: Wed, 7 Jun 2023 20:33:33 +0000 Message-ID: <20230607203333.26669-3-risbhat@amazon.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230607203333.26669-1-risbhat@amazon.com> References: <20230607203333.26669-1-risbhat@amazon.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768081731962814404?= X-GMAIL-MSGID: =?utf-8?q?1768081731962814404?= From: Paulo Alcantara commit a52930353eaf443489a350a135c5525a4acbbf56 upstream. In case there were no cached DFS referrals in reconn_setup_dfs_targets(), set cifs_sb to NULL prior to calling reconn_set_next_dfs_target() so it would not try to access an empty tgt_list. Signed-off-by: Paulo Alcantara (SUSE) Reviewed-by: Aurelien Aptel Signed-off-by: Steve French Signed-off-by: Rishabh Bhatnagar --- fs/cifs/connect.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index b5cd3dc479ce..d8d9d9061544 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -513,11 +513,13 @@ cifs_reconnect(struct TCP_Server_Info *server) sb = NULL; } else { cifs_sb = CIFS_SB(sb); - rc = reconn_setup_dfs_targets(cifs_sb, &tgt_list); - if (rc && (rc != -EOPNOTSUPP)) { - cifs_server_dbg(VFS, "%s: no target servers for DFS failover\n", - __func__); + if (rc) { + cifs_sb = NULL; + if (rc != -EOPNOTSUPP) { + cifs_server_dbg(VFS, "%s: no target servers for DFS failover\n", + __func__); + } } else { server->nr_targets = dfs_cache_get_nr_tgts(&tgt_list); }