Commit b9e9361c authored by Michał Kępień's avatar Michał Kępień
Browse files

Asynchronous zone load events have no way of getting canceled

Code handling cancellation of asynchronous zone load events was likely
copied over from other functions when asynchronous zone loading was
first implemented in commit 8a2ab2b9.  However, unlike those other
functions, asynchronous zone loading events currently have no way of
getting canceled once they get posted, which means the aforementioned
code is effectively dead.  Remove it to prevent confusion.
parent 29b7efdd
...@@ -2162,20 +2162,15 @@ static void ...@@ -2162,20 +2162,15 @@ static void
zone_asyncload(isc_task_t *task, isc_event_t *event) { zone_asyncload(isc_task_t *task, isc_event_t *event) {
dns_asyncload_t *asl = event->ev_arg; dns_asyncload_t *asl = event->ev_arg;
dns_zone_t *zone = asl->zone; dns_zone_t *zone = asl->zone;
isc_result_t result = ISC_R_SUCCESS; isc_result_t result;
isc_boolean_t load_pending; isc_boolean_t load_pending;
UNUSED(task); UNUSED(task);
REQUIRE(DNS_ZONE_VALID(zone)); REQUIRE(DNS_ZONE_VALID(zone));
if ((event->ev_attributes & ISC_EVENTATTR_CANCELED) != 0)
result = ISC_R_CANCELED;
isc_event_free(&event); isc_event_free(&event);
if (result == ISC_R_CANCELED)
goto cleanup;
/* Make sure load is still pending */ /* Make sure load is still pending */
LOCK_ZONE(zone); LOCK_ZONE(zone);
load_pending = ISC_TF(DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADPENDING)); load_pending = ISC_TF(DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADPENDING));
......
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