diff options
| author | Alexander Aring <aahringo@redhat.com> | 2021-05-21 15:08:38 -0400 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2021-05-25 09:22:20 -0500 |
| commit | c6aa00e3d20c2767ba3f57b64eb862572b9744b3 (patch) | |
| tree | cea40c8ada606fc1ef7439eaa87a4ee2c6514c93 /fs/dlm | |
| parent | ba868d9deaab2bb1c09e50650127823925154802 (diff) | |
| download | linux-stable-c6aa00e3d20c2767ba3f57b64eb862572b9744b3.tar.gz linux-stable-c6aa00e3d20c2767ba3f57b64eb862572b9744b3.tar.bz2 linux-stable-c6aa00e3d20c2767ba3f57b64eb862572b9744b3.zip | |
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>
Diffstat (limited to 'fs/dlm')
| -rw-r--r-- | fs/dlm/lowcomms.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c index 051f22dbb83a..0a4851b3cd4b 100644 --- a/fs/dlm/lowcomms.c +++ b/fs/dlm/lowcomms.c @@ -715,7 +715,7 @@ static void close_connection(struct connection *con, bool and_other, if (con->othercon && and_other) { /* Will only re-enter once. */ - close_connection(con->othercon, false, true, true); + close_connection(con->othercon, false, tx, rx); } con->rx_leftover = 0; |