mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 11:19:37 +00:00
DLM: close othercon at send/receive error
If an error occurs in the sending / receiving process, if othercon exists, sending / receiving processing using othercon may also result in an error. We fix to pre-close othercon as well. Signed-off-by: Tadashi Miyauchi <miyauchi@toshiba-tops.co.jp> Signed-off-by: Tsutomu Owa <tsutomu.owa@toshiba.co.jp> Signed-off-by: David Teigland <teigland@redhat.com>
This commit is contained in:
parent
5966121241
commit
c553e173b0
1 changed files with 2 additions and 2 deletions
|
@ -703,7 +703,7 @@ static int receive_from_sock(struct connection *con)
|
|||
out_close:
|
||||
mutex_unlock(&con->sock_mutex);
|
||||
if (ret != -EAGAIN) {
|
||||
close_connection(con, false, true, false);
|
||||
close_connection(con, true, true, false);
|
||||
/* Reconnect when there is something to send */
|
||||
}
|
||||
/* Don't return success if we really got EOF */
|
||||
|
@ -1530,7 +1530,7 @@ static void send_to_sock(struct connection *con)
|
|||
|
||||
send_error:
|
||||
mutex_unlock(&con->sock_mutex);
|
||||
close_connection(con, false, false, true);
|
||||
close_connection(con, true, false, true);
|
||||
/* Requeue the send work. When the work daemon runs again, it will try
|
||||
a new connection, then call this function again. */
|
||||
queue_work(send_workqueue, &con->swork);
|
||||
|
|
Loading…
Reference in a new issue