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;
From:   Wang Hai <wanghai38@huawei.com>
To:     <trond.myklebust@hammerspace.com>, <bfields@fieldses.org>,
        <anna@kernel.org>, <chuck.lever@oracle.com>, <davem@davemloft.net>,
        <kuba@kernel.org>, <pabeni@redhat.com>
CC:     <linux-nfs@vger.kernel.org>, <netdev@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>, <wanghai38@huawei.com>
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>
In-Reply-To: <20220511132232.4030-1-wanghai38@huawei.com>
References: <20220511132232.4030-1-wanghai38@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain
Precedence: bulk

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 <wanghai38@huawei.com>
---
 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