Received: by 2002:a05:7412:bc1a:b0:d7:7d3a:4fe2 with SMTP id ki26csp638231rdb; Sat, 19 Aug 2023 17:37:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEFl01+XTHTz9/OtUBhJJG+wkKCLlxaXuL2AHVrF10vs+LLeRPG0hzclwd1RDXTyasRI08/ X-Received: by 2002:a05:6870:d150:b0:1b5:688b:5c24 with SMTP id f16-20020a056870d15000b001b5688b5c24mr3246372oac.32.1692491848063; Sat, 19 Aug 2023 17:37:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692491848; cv=none; d=google.com; s=arc-20160816; b=QxgRW22Sm7FudanvZQC6mC7hR5SofL9bmwhhqYDmJgTqwpgMx+/3rPimnsA8D5JTaM IvlnGT8tAq+CFN7nA9ChAnKWxdDPS7NQgo/o+4ie+Y0E8WXD2FHEyWOHSiUznnwZHPj2 sflqlMNoE/vf1reBAlI+9B+y517D6xDwsnNxIcrj7c5WGWnmBovfqEo1TQxT8rEpuzB+ WBVGG7aGIjT5KpAHneJ8SYtBNcTQJs7c9oC40o2qjvTQAPi/RJsxZkBJUBwNthAb1XV8 249HQhzM0d4ucuQVA9Fq9upX1Xenmv2h3whHP/rl1GialNZZMSe1KMR2TbUXk//gCr/T s4EA== 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=pvm3ZqtpNjqmmC1MATUJ0tpxAFa/KdQNwnmWUO6OLZU=; fh=fCSIe3MjmmvpTcO4md76JKuZjU/cxY+3my+jeGWNbGA=; b=WHE6iUkqLBPxzrTbBGqsNUlyETspTRG09wx90FgVgqRj/0FTneUdIAAVv/XniZSU30 tXyFGFMlT6fjokPgTtAbw29ZnHmGHmWAQEeiG17eyDOB1YRqF08rELuHRvdwiZiNnuui /047IkOXxU4on3IOjDzMhB0m+uCTahtc1eIjN03q9Qf87DvPzlm+CkiNOTE0yLJ3ClZk +Ram4c3aVJRfrcAnDRjgcnKxj3eYIguIm+le5NIBOH5n83w7W9bimLUIU6VGQPPJPMac hlU4W5g7rMC01CGmziX1eulcRYP105vId0lQoIFjkoPbtzX6BACXnm/HfudGvzIVppYe 5CcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Wuw+BC7B; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lk12-20020a17090b33cc00b0025defcc6e75si4672835pjb.172.2023.08.19.17.37.14; Sat, 19 Aug 2023 17:37:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-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=@kernel.org header.s=k20201202 header.b=Wuw+BC7B; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229479AbjHTAWQ (ORCPT + 99 others); Sat, 19 Aug 2023 20:22:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229880AbjHTAVk (ORCPT ); Sat, 19 Aug 2023 20:21:40 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B19D7E1C08 for ; Sat, 19 Aug 2023 14:39:16 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 43F35619E1 for ; Sat, 19 Aug 2023 21:39:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A1A7C433C9; Sat, 19 Aug 2023 21:39:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692481155; bh=8Vg7YLpqSpUemOlkTUZSjO5s6OVfvObnyW4C4J4K9zM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wuw+BC7BBBAJaaoeryuAPOFxnYPHMcQNUorGda//lmGkV8sD+Hp91iiM6c2/d5Ysl S71RRjTNZ8mieEyzGb7D2aeU7SvH+/Q+YVJo18kMNBEbQNikt0LE5wFZQ1xFE8j2MS 9p5fyEKCPL2J1AH9pSWBL7WcCcmICbzJEm8Dmo60WuTg7bSyS5xTFD5nGag5ZRcSIu TQKQ1XKRvbVou/DmBoQPViUJpM1VKc81qO9fh+HmCzh5akSdu3CxfAAepA0kXFMyEW qFxnFbYLIgcamPJ4X87fm/TH+UAB1qNdkg8epdRCCXpZMW8V78C/VbmxerZVgdrcTZ 1jD8JSw68Mgeg== From: trondmy@kernel.org To: Anna Schumaker Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2 4/5] SUNRPC: Don't override connect timeouts in rpc_clnt_add_xprt() Date: Sat, 19 Aug 2023 17:32:24 -0400 Message-ID: <20230819213225.731214-5-trondmy@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230819213225.731214-4-trondmy@kernel.org> References: <20230819213225.731214-1-trondmy@kernel.org> <20230819213225.731214-2-trondmy@kernel.org> <20230819213225.731214-3-trondmy@kernel.org> <20230819213225.731214-4-trondmy@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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_PASS 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-nfs@vger.kernel.org From: Trond Myklebust If the caller specifies the connect timeouts in the arguments to rpc_clnt_add_xprt(), then we shouldn't override them. Signed-off-by: Trond Myklebust --- net/sunrpc/clnt.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 9edebfdb5ce1..943dc3897378 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -3071,6 +3071,11 @@ int rpc_clnt_add_xprt(struct rpc_clnt *clnt, } xprt->resvport = resvport; xprt->reuseport = reuseport; + + if (xprtargs->connect_timeout) + connect_timeout = xprtargs->connect_timeout; + if (xprtargs->reconnect_timeout) + reconnect_timeout = xprtargs->reconnect_timeout; if (xprt->ops->set_connect_timeout != NULL) xprt->ops->set_connect_timeout(xprt, connect_timeout, -- 2.41.0