Skip to content

Commit

Permalink
Merge tag 'dlm-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/…
Browse files Browse the repository at this point in the history
…teigland/linux-dlm

Pull dlm fix from David Teigland:
 "This includes a bug fix for a bad memory access during workqueue
  cleanup, which can happen while shutting down the dlm networking
  layer"

* tag 'dlm-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: free workqueues after the connections
  • Loading branch information
Linus Torvalds committed Oct 10, 2016
2 parents 8dfb790 + 3a8db79 commit 6763afe
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions fs/dlm/lowcomms.c
Original file line number Diff line number Diff line change
@@ -1656,16 +1656,12 @@ void dlm_lowcomms_stop(void)
mutex_lock(&connections_lock);
dlm_allow_conn = 0;
foreach_conn(stop_conn);
clean_writequeues();
foreach_conn(free_conn);
mutex_unlock(&connections_lock);

work_stop();

mutex_lock(&connections_lock);
clean_writequeues();

foreach_conn(free_conn);

mutex_unlock(&connections_lock);
kmem_cache_destroy(con_cache);
}

0 comments on commit 6763afe

Please sign in to comment.