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 [thread overview]
Message-ID: <20220511132232.4030-3-wanghai38@huawei.com> (raw)
In-Reply-To: <20220511132232.4030-1-wanghai38@huawei.com>
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
next prev parent reply other threads:[~2022-05-11 13:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-11 13:22 [PATCH 0/3] Refix the socket leak in xs_setup_local() Wang Hai
2022-05-11 13:22 ` [PATCH 1/3] Revert "SUNRPC: Ensure gss-proxy connects on setup" Wang Hai
2022-05-11 13:22 ` Wang Hai [this message]
2022-05-11 13:22 ` [PATCH 3/3] SUNRPC: Fix local socket leak in xs_setup_local() Wang Hai
2022-05-11 16:14 ` [PATCH 0/3] Refix the " Trond Myklebust
2022-05-12 1:58 ` wanghai (M)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220511132232.4030-3-wanghai38@huawei.com \
--to=wanghai38@huawei.com \
--cc=anna@kernel.org \
--cc=bfields@fieldses.org \
--cc=chuck.lever@oracle.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=trond.myklebust@hammerspace.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).