mirror of
https://github.com/isc-projects/bind9.git
synced 2026-03-01 21:10:55 -05:00
Merge branch '2156-threadsanitizer-lock-order-inversion-potential-deadlock-in-pthread_mutex_lock' into 'main'
Resolve "ThreadSanitizer: lock-order-inversion (potential deadlock) in pthread_mutex_lock" Closes #2156 See merge request isc-projects/bind9!4150
This commit is contained in:
commit
62053255ec
1 changed files with 1 additions and 1 deletions
|
|
@ -627,7 +627,6 @@ view_flushanddetach(dns_view_t **viewp, bool flush) {
|
|||
dns_zone_t *mkzone = NULL, *rdzone = NULL;
|
||||
|
||||
isc_refcount_destroy(&view->references);
|
||||
LOCK(&view->lock);
|
||||
if (!RESSHUTDOWN(view)) {
|
||||
dns_resolver_shutdown(view->resolver);
|
||||
}
|
||||
|
|
@ -637,6 +636,7 @@ view_flushanddetach(dns_view_t **viewp, bool flush) {
|
|||
if (!REQSHUTDOWN(view)) {
|
||||
dns_requestmgr_shutdown(view->requestmgr);
|
||||
}
|
||||
LOCK(&view->lock);
|
||||
if (view->zonetable != NULL) {
|
||||
if (view->flush) {
|
||||
dns_zt_flushanddetach(&view->zonetable);
|
||||
|
|
|
|||
Loading…
Reference in a new issue