Commit e7a41b27 authored by David Windsor's avatar David Windsor Committed by Greg Kroah-Hartman

dlm: check if workqueues are NULL before flushing/destroying

[ Upstream commit b355516f ]

If the DLM lowcomms stack is shut down before any DLM
traffic can be generated, flush_workqueue() and
destroy_workqueue() can be called on empty send and/or recv
workqueues.

Insert guard conditionals to only call flush_workqueue()
and destroy_workqueue() on workqueues that are not NULL.
Signed-off-by: default avatarDavid Windsor <dwindsor@redhat.com>
Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5d59e28c
...@@ -1630,8 +1630,10 @@ static void clean_writequeues(void) ...@@ -1630,8 +1630,10 @@ static void clean_writequeues(void)
static void work_stop(void) static void work_stop(void)
{ {
destroy_workqueue(recv_workqueue); if (recv_workqueue)
destroy_workqueue(send_workqueue); destroy_workqueue(recv_workqueue);
if (send_workqueue)
destroy_workqueue(send_workqueue);
} }
static int work_start(void) static int work_start(void)
...@@ -1691,13 +1693,17 @@ static void work_flush(void) ...@@ -1691,13 +1693,17 @@ static void work_flush(void)
struct hlist_node *n; struct hlist_node *n;
struct connection *con; struct connection *con;
flush_workqueue(recv_workqueue); if (recv_workqueue)
flush_workqueue(send_workqueue); flush_workqueue(recv_workqueue);
if (send_workqueue)
flush_workqueue(send_workqueue);
do { do {
ok = 1; ok = 1;
foreach_conn(stop_conn); foreach_conn(stop_conn);
flush_workqueue(recv_workqueue); if (recv_workqueue)
flush_workqueue(send_workqueue); flush_workqueue(recv_workqueue);
if (send_workqueue)
flush_workqueue(send_workqueue);
for (i = 0; i < CONN_HASH_SIZE && ok; i++) { for (i = 0; i < CONN_HASH_SIZE && ok; i++) {
hlist_for_each_entry_safe(con, n, hlist_for_each_entry_safe(con, n,
&connection_hash[i], list) { &connection_hash[i], list) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment