Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp6848989iob; Wed, 11 May 2022 06:43:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwZqBhcPzG3cKUBa0S+ftINGoEE2PoWgbnTrmt7GnjN26Zsn0m9m5gvDd6q8ZSfdMWROVzt X-Received: by 2002:a17:902:b941:b0:14d:af72:3f23 with SMTP id h1-20020a170902b94100b0014daf723f23mr26068941pls.6.1652276590339; Wed, 11 May 2022 06:43:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652276590; cv=none; d=google.com; s=arc-20160816; b=R8MmlDG4OjdEQQF7dDPqSuJNrv+pzqgxrgBm4DEoVVvD4HdLAdM5Bw2ZZiFFuu0eDC x1JIYRrL8e0BVhiVrtlXkQsvuKIy6TmroorjwqRYpH97WjVz4TZ3iGVaV5TJ40PMpk13 ye4TIxdLyUL6Ru9/QkjDAQcs2N/Tj6ksmTAeBaBdu81BVvJBAVceBcZDODuOX/u2vZJq eEoPRwl2dhDf4Hj2uaIEGGsqesCz4tRhG9juWmKshveA6NmvkxkBgwMUfOmiK7ehrnNE bIZKHFB5mw49x7lh9sONu5FN3GV7ALwT6Ud4PSTSGMz7fV82FSiWXLr17o6TnlMRHCCW nTaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=rnhoEYL7g/CJ2BPUZaBlkUAYOLYmPsro2fAp5+URe1I=; b=oNgmq3iF8kPAylbu8iRxGs3xHW3Dz9yOdZwCmLkdpqW0RjCyxR+bVgxTsMZcJdrVEd gXORg7nXU9u3goeb0Rb6ITMkIxxjI+8twfHVdJ5DQ8F0Bc8YHOjV4w1Ynpmc6IlyEvS9 Bw+M/THMcB1TIhfDgs00x+znbEpQleqP6vdqIho2EwsSjHBNjvKteAfHtyDcMJr6R79Z k1KloneYLwEWHRYNUGP/hli3FBJlhQxYWlRtPG5NWHxLqAa7znBb7I7o+ACL386lT0U/ uLXiN2J695eljPOgswuJ/4QMJs07oHKqriOxXF6zhptNbWwSmTIRIKr2gGn54uXjQ52i Vohw== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v189-20020a6389c6000000b003aa70eea1fasi2887202pgd.241.2022.05.11.06.42.55; Wed, 11 May 2022 06:43:10 -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; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243155AbiEKNE0 (ORCPT + 99 others); Wed, 11 May 2022 09:04:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243049AbiEKNEQ (ORCPT ); Wed, 11 May 2022 09:04:16 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7AD2233A5F; Wed, 11 May 2022 06:04:12 -0700 (PDT) Received: from kwepemi100017.china.huawei.com (unknown [172.30.72.54]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4Kyw3G2ZsmzCscg; Wed, 11 May 2022 20:59:22 +0800 (CST) Received: from kwepemm600001.china.huawei.com (7.193.23.3) by kwepemi100017.china.huawei.com (7.221.188.163) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 11 May 2022 21:04:09 +0800 Received: from huawei.com (10.175.113.133) by kwepemm600001.china.huawei.com (7.193.23.3) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Wed, 11 May 2022 21:04:09 +0800 From: Wang Hai To: , , , , , , CC: , , , Subject: [PATCH 2/3] Revert "Revert "SUNRPC: attempt AF_LOCAL connect on setup"" Date: Wed, 11 May 2022 21:22:31 +0800 Message-ID: <20220511132232.4030-3-wanghai38@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220511132232.4030-1-wanghai38@huawei.com> References: <20220511132232.4030-1-wanghai38@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.113.133] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemm600001.china.huawei.com (7.193.23.3) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,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-nfs@vger.kernel.org This reverts commit a3d0562d4dc039bca39445e1cddde7951662e17d. There is currently no better way to ensure that gss-proxy connects when setup. Therefore, it is still necessary to connect in the construction. The mechanism to safely tear xprt down needs to be implemented later. Signed-off-by: Wang Hai --- net/sunrpc/xprtsock.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 650102a9c86a..25b8a8ead56b 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -2875,6 +2875,9 @@ 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); -- 2.17.1