Commit 3fccc260 authored by Evan Hunt's avatar Evan Hunt
Browse files

[master] Merge branch 'master' of ssh://repo/proj/git/prod/bind9

parents 9cc2e4b4 189efe77
......@@ -8264,7 +8264,8 @@ ns_server_add_zone(ns_server_t *server, char *args) {
CHECK(isc_stdio_open(view->new_zone_file, "a", &fp));
/* Mark view unfrozen so that zone can be added */
isc_task_beginexclusive(server->task);
result = isc_task_beginexclusive(server->task);
RUNTIME_CHECK(result == ISC_R_SUCCESS);
dns_view_thaw(view);
result = configure_zone(cfg->config, parms, vconfig,
server->mctx, view, cfg->actx, ISC_FALSE,
......
......@@ -539,7 +539,9 @@ grow_entries(isc_task_t *task, isc_event_t *ev) {
isc_event_free(&ev);
isc_task_beginexclusive(task);
result = isc_task_beginexclusive(task);
if (result != ISC_R_SUCCESS)
goto check_exit;
i = 0;
while (nbuckets[i] != 0 && adb->nentries >= nbuckets[i])
......@@ -669,6 +671,7 @@ grow_entries(isc_task_t *task, isc_event_t *ev) {
done:
isc_task_endexclusive(task);
check_exit:
LOCK(&adb->lock);
if (dec_adb_irefcnt(adb))
check_exit(adb);
......@@ -693,7 +696,9 @@ grow_names(isc_task_t *task, isc_event_t *ev) {
isc_event_free(&ev);
isc_task_beginexclusive(task);
result = isc_task_beginexclusive(task);
if (result != ISC_R_SUCCESS)
goto check_exit;
i = 0;
while (nbuckets[i] != 0 && adb->nnames >= nbuckets[i])
......@@ -819,6 +824,7 @@ grow_names(isc_task_t *task, isc_event_t *ev) {
done:
isc_task_endexclusive(task);
check_exit:
LOCK(&adb->lock);
if (dec_adb_irefcnt(adb))
check_exit(adb);
......
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