diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-10 13:58:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-10 13:58:06 -0700 |
| commit | 6763afe4b9f39142bda2a92d69e62fe85f67251c (patch) | |
| tree | 05e5a6c4bc570ca2aff5b9e4bc518bc106ae7a75 /fs | |
| parent | Merge tag 'ceph-for-4.9-rc1' of git://github.com/ceph/ceph-client (diff) | |
| parent | dlm: free workqueues after the connections (diff) | |
| download | linux-dev-6763afe4b9f39142bda2a92d69e62fe85f67251c.tar.xz linux-dev-6763afe4b9f39142bda2a92d69e62fe85f67251c.zip | |
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
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/dlm/lowcomms.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c index 963016c8f3d1..609998de533e 100644 --- a/fs/dlm/lowcomms.c +++ b/fs/dlm/lowcomms.c @@ -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); } |