Skip to content

Commit c6aa00e

Browse files
Alexander Aringteigland
authored andcommitted
fs: dlm: cancel work sync othercon
These rx tx flags arguments are for signaling close_connection() from which worker they are called. Obviously the receive worker cannot cancel itself and vice versa for swork. For the othercon the receive worker should only be used, however to avoid deadlocks we should pass the same flags as the original close_connection() was called. Signed-off-by: Alexander Aring <aahringo@redhat.com> Signed-off-by: David Teigland <teigland@redhat.com>
1 parent ba868d9 commit c6aa00e

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

fs/dlm/lowcomms.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@ static void close_connection(struct connection *con, bool and_other,
715715

716716
if (con->othercon && and_other) {
717717
/* Will only re-enter once. */
718-
close_connection(con->othercon, false, true, true);
718+
close_connection(con->othercon, false, tx, rx);
719719
}
720720

721721
con->rx_leftover = 0;

0 commit comments

Comments
 (0)