diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-07 14:04:42 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-07 14:04:42 -0700 |
| commit | f081d8985a1a44da1fe35ba345e71bffd8d77945 (patch) | |
| tree | ad16f50c27c51edf6644ca4ef0902cd4327a3d2d /src | |
| parent | bd412f9d3d3a567568f7ba4f081447315c957495 (diff) | |
different merge
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/lib/iomgr/ev_epollex_linux.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/lib/iomgr/ev_epollex_linux.c b/src/core/lib/iomgr/ev_epollex_linux.c index 734f0c9a57..9bba20e9a6 100644 --- a/src/core/lib/iomgr/ev_epollex_linux.c +++ b/src/core/lib/iomgr/ev_epollex_linux.c @@ -1026,14 +1026,12 @@ static void pollset_set_del_pollset(grpc_exec_ctx *exec_ctx, static void pollset_set_add_pollset_set(grpc_exec_ctx *exec_ctx, grpc_pollset_set *bag, grpc_pollset_set *item) { - pss_add_obj(exec_ctx, bag, &item->po, PSS_POLLSET_SET); + pss_merge(exec_ctx, bag, item); } static void pollset_set_del_pollset_set(grpc_exec_ctx *exec_ctx, grpc_pollset_set *bag, - grpc_pollset_set *item) { - pss_del_obj(exec_ctx, bag, &item->po, PSS_POLLSET_SET); -} + grpc_pollset_set *item) {} /******************************************************************************* * Event engine binding |