From f081d8985a1a44da1fe35ba345e71bffd8d77945 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Fri, 7 Apr 2017 14:04:42 -0700 Subject: [PATCH] different merge --- src/core/lib/iomgr/ev_epollex_linux.c | 6 ++---- 1 file 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 734f0c9a576..9bba20e9a60 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