fs: dlm: fix sock release if listen fails
Subsystems (2)
Alexander Aring
maintainerPATCH 1/2 fs: dlm: fix sock release if listen fails
This patch fixes a double sock_release() call when the listen() is called for the dlm lowcomms listen socket. The caller of dlm_listen_for_all should never care about releasing the socket if dlm_listen_for_all() fails, it's done now only once if listen() fails.
--- fs/dlm/lowcomms.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/dlm/lowcomms.c +1 -2
@@ -1820,7 +1820,7 @@ static int dlm_listen_for_all(void) result = sock->ops->listen (sock,5 );if (result <0 ) {dlm_close_sock (&listen_con.sock); - goto out; +return result; }return 0 ;
@@ -2023,7 +2023,6 @@ int dlm_lowcomms_start(void) dlm_proto_ops =NULL ; fail_proto_ops: dlm_allow_conn =0 ; -dlm_close_sock (&listen_con.sock);work_stop (); fail_local:deinit_local ();
Signature · 1 line
2.31.1
Alexander Aring
maintainerPATCH 2/2 fs: dlm: retry accept() until -EAGAIN or error returns
This patch fixes a race if we get two times an socket data ready event while the listen connection worker is queued. Currently it will be served only once but we need to do it (in this case twice) until we hit -EAGAIN which tells us there is no pending accept going on.
This patch wraps an do while loop until we receive a return value which is different than 0 as it was done before commit d11ccd451b65 ("fs: dlm:
listen socket out of connection hash").
--- fs/dlm/lowcomms.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/dlm/lowcomms.c +5 -1
@@ -1543,7 +1543,11 @@ static void process_recv_sockets(struct work_struct *work)static void process_listen_recv_socket (struct work_struct *work) { -accept_from_sock (&listen_con); +int ret; + +do { + ret =accept_from_sock (&listen_con); + }while (!ret); }static void dlm_connect (struct connection *con)
Signature · 1 line
2.31.1