diff options
| author |  Sree Kuchibhotla <sreecha@users.noreply.github.com> | 2017-01-23 14:18:58 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-01-23 14:18:58 -0800 |
| commit | 24e5f3ad6203c4f83fb89907b952b9d19d5fa73f (patch) | |
| tree | e7ce33ced74e2a324d8fc66c02829cc86f027196 /src | |
| parent | c9cf96d2e161c21afa4ea409e3d92040e1b4aacc (diff) | |
| parent | daa9f45f0e8963c4dd3fa4bc23bd28fbdb54becb (diff) | |
Merge pull request #8810 from htuch/pollset-fix
Fix workqueue_move_items_to_parent invocation bug in polling_island_merge
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/lib/iomgr/ev_epoll_linux.c | 2 |
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 */ |