From daa9f45f0e8963c4dd3fa4bc23bd28fbdb54becb Mon Sep 17 00:00:00 2001 From: Harvey Tuch Date: Mon, 21 Nov 2016 15:42:49 -0500 Subject: Fix workqueue_move_items_to_parent() invocation bug in polling_island_merge()[ev_epoll_linux.c]. This bug resulted in workqueue items failing to merge correctly and consequently queued closures would fail to execute. --- src/core/lib/iomgr/ev_epoll_linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/core/lib/iomgr/ev_epoll_linux.c b/src/core/lib/iomgr/ev_epoll_linux.c index d6664aead2..715d057c51 100644 --- a/src/core/lib/iomgr/ev_epoll_linux.c +++ b/src/core/lib/iomgr/ev_epoll_linux.c @@ -796,7 +796,7 @@ static polling_island *polling_island_merge(polling_island *p, gpr_atm_rel_store(&p->merged_to, (gpr_atm)q); PI_ADD_REF(q, "pi_merge"); /* To account for the new incoming ref from p */ - workqueue_move_items_to_parent(q); + workqueue_move_items_to_parent(p); } /* else if p == q, nothing needs to be done */ -- cgit v1.2.3