Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00dcffae authored by Marcelo Ricardo Leitner's avatar Marcelo Ricardo Leitner Committed by David Teigland
Browse files

dlm: fix reconnecting but not sending data 



There are cases on which lowcomms_connect_sock() is called directly,
which caused the CF_WRITE_PENDING flag to not bet set upon reconnect,
specially on send_to_sock() error handling. On this last, the flag was
already cleared and no further attempt on transmitting would be done.

As dlm tends to connect when it needs to transmit something, it makes
sense to always mark this flag right after the connect.

Signed-off-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent acee4e52

fs/dlm/lowcomms.c

+3 −3
Original line number Diff line number Diff line
@@ -1020,6 +1020,7 @@ static void sctp_connect_to_sock(struct connection *con) 


out:

	mutex_unlock(&con->sock_mutex);

	set_bit(CF_WRITE_PENDING, &con->flags);

}



/* Connect a new socket to its peer */
@@ -1114,6 +1115,7 @@ static void tcp_connect_to_sock(struct connection *con) 
	}

out:

	mutex_unlock(&con->sock_mutex);

	set_bit(CF_WRITE_PENDING, &con->flags);

	return;

}
@@ -1502,10 +1504,8 @@ static void process_send_sockets(struct work_struct *work) 
{

	struct connection *con = container_of(work, struct connection, swork);



	if (test_and_clear_bit(CF_CONNECT_PENDING, &con->flags)) {

	if (test_and_clear_bit(CF_CONNECT_PENDING, &con->flags))

		con->connect_action(con);

		set_bit(CF_WRITE_PENDING, &con->flags);

	}

	if (test_and_clear_bit(CF_WRITE_PENDING, &con->flags))

		send_to_sock(con);

}