From patchwork Fri Apr 29 17:36:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 12832570 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B559FC433FE for ; Fri, 29 Apr 2022 17:42:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379769AbiD2RqC (ORCPT ); Fri, 29 Apr 2022 13:46:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379762AbiD2RqA (ORCPT ); Fri, 29 Apr 2022 13:46:00 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC1B9D3710 for ; Fri, 29 Apr 2022 10:42:40 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 84499B8376D for ; Fri, 29 Apr 2022 17:42:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A97E2C385A7; Fri, 29 Apr 2022 17:42:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1651254158; bh=MBQFP4NqrMN0hqGMiSd3JimixdJBn9XsfqOd1NGTQKA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rYfmZsoBkwP750VV0FNDPKWzSHgHgwIr28LPrl5fQW20P8XBlO4ySUx72YW/KHrm8 Hke44B3gthDeRKA7v7LzPhdBWv+NqKtfUqiD6Hbip36vQv0IYerJZMzurgc9yM8/qT ZIZFP+bOzA33RP3B7b9eiL9qH2wWl1VgT1Kskev0jAwhkv3PVSgO6FJQ9MptabGXrU qjmBlaCopY3xu/fSkkIy+8uDQYzYdYEfgzA0Zpy/z2eEkoFXhGDhJ1ON4wWdPoEn1S t+pHeQ0yBJJWumssZVmsC+fa9MXSkawrDXWNeo1YRoAp3Ehmm0wXrrCXMsjhrL9Oeb PeTJTqBYNtkEg== From: trondmy@kernel.org To: "wanghai (M)" Cc: "J. Bruce Fields" , Chuck Lever , linux-nfs@vger.kernel.org Subject: [PATCH v2 4/4] Revert "SUNRPC: attempt AF_LOCAL connect on setup" Date: Fri, 29 Apr 2022 13:36:29 -0400 Message-Id: <20220429173629.621418-4-trondmy@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220429173629.621418-3-trondmy@kernel.org> References: <20220429173629.621418-1-trondmy@kernel.org> <20220429173629.621418-2-trondmy@kernel.org> <20220429173629.621418-3-trondmy@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Trond Myklebust This reverts commit 7073ea8799a8cf73db60270986f14e4aae20fa80. We must not try to connect the socket while the transport is under construction, because the mechanisms to safely tear it down are not in place. Cc: stable@vger.kernel.org Signed-off-by: Trond Myklebust --- net/sunrpc/xprtsock.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 25b8a8ead56b..650102a9c86a 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -2875,9 +2875,6 @@ static struct rpc_xprt *xs_setup_local(struct xprt_create *args) } xprt_set_bound(xprt); xs_format_peer_addresses(xprt, "local", RPCBIND_NETID_LOCAL); - ret = ERR_PTR(xs_local_setup_socket(transport)); - if (ret) - goto out_err; break; default: ret = ERR_PTR(-EAFNOSUPPORT);