diff options
author | Sree Kuchibhotla <sreek@google.com> | 2017-02-22 11:56:52 -0800 |
---|---|---|
committer | Sree Kuchibhotla <sreek@google.com> | 2017-02-22 11:56:52 -0800 |
commit | 1392496e7f861fa03ed6edfcb1687a3b233b9b30 (patch) | |
tree | a23f989be296c2b322f80aea626c22520e3ce0ee /src/core/lib/iomgr/ev_epoll_linux.c | |
parent | ff4b25d802845d3237e3890db240f3059d0ff784 (diff) | |
parent | 81f81c26f6c309eb6e8f7ce499f8ad9f9de40609 (diff) |
Merge branch 'master' into fd_rw_atm_closure
Diffstat (limited to 'src/core/lib/iomgr/ev_epoll_linux.c')
-rw-r--r-- | src/core/lib/iomgr/ev_epoll_linux.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/lib/iomgr/ev_epoll_linux.c b/src/core/lib/iomgr/ev_epoll_linux.c index 5c77eda006..31ef433229 100644 --- a/src/core/lib/iomgr/ev_epoll_linux.c +++ b/src/core/lib/iomgr/ev_epoll_linux.c @@ -1968,13 +1968,12 @@ static grpc_pollset_set *pollset_set_create(void) { return pss; } -static void pollset_set_destroy(grpc_pollset_set *pss) { +static void pollset_set_destroy(grpc_exec_ctx *exec_ctx, + grpc_pollset_set *pss) { gpr_mu_destroy(&pss->po.mu); if (pss->po.pi != NULL) { - grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - PI_UNREF(&exec_ctx, pss->po.pi, "pss_destroy"); - grpc_exec_ctx_finish(&exec_ctx); + PI_UNREF(exec_ctx, pss->po.pi, "pss_destroy"); } gpr_free(pss); |