aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Harvey Tuch <htuch@google.com>2016-11-21 15:42:49 -0500
committerGravatar Harvey Tuch <htuch@google.com>2017-01-20 16:29:56 -0500
commitdaa9f45f0e8963c4dd3fa4bc23bd28fbdb54becb (patch)
treeda3bf6a92b148e1b016efeba36b4993b104e6ee3 /src
parentbd827887ffbb57a95990130f585913b13f44a5b7 (diff)
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.
Diffstat (limited to 'src')
-rw-r--r--src/core/lib/iomgr/ev_epoll_linux.c2
1 files changed, 1 insertions, 1 deletions
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 */