Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6763afe4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dlm-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/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
parents 8dfb790b 3a8db798

fs/dlm/lowcomms.c

+2 −6
Original line number Original line Diff line number Diff line
@@ -1656,16 +1656,12 @@ void dlm_lowcomms_stop(void) 
	mutex_lock(&connections_lock);

	mutex_lock(&connections_lock);

	dlm_allow_conn = 0;

	dlm_allow_conn = 0;

	foreach_conn(stop_conn);

	foreach_conn(stop_conn);

	clean_writequeues();

	foreach_conn(free_conn);

	mutex_unlock(&connections_lock);

	mutex_unlock(&connections_lock);





	work_stop();

	work_stop();





	mutex_lock(&connections_lock);

	clean_writequeues();



	foreach_conn(free_conn);



	mutex_unlock(&connections_lock);

	kmem_cache_destroy(con_cache);

	kmem_cache_destroy(con_cache);

}

}