different merge

8 years ago · f081d8985a
parent bd412f9d3d
commit f081d8985a
1 changed files with 2 additions and 4 deletions
--- 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