aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2017-01-26 11:30:57 -0800
committerGravatar Craig Tiller <ctiller@google.com>2017-01-26 11:30:57 -0800
commit7a5b9eeeaed1d79434917abb4990145602478aa1 (patch)
tree41edb2ace8e67f98161283152f29004371bab38d
parentc63aaf1650858cb99346a324e1a9235685a717c7 (diff)
parent5082d7e94264380d135fce54bf71df70b1290c19 (diff)
Merge branch 'unflatten' into rollfwd
-rw-r--r--src/core/lib/iomgr/resource_quota.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/core/lib/iomgr/resource_quota.c b/src/core/lib/iomgr/resource_quota.c
index 41ea609c73..d5995a5ac6 100644
--- a/src/core/lib/iomgr/resource_quota.c
+++ b/src/core/lib/iomgr/resource_quota.c
@@ -808,12 +808,10 @@ void grpc_resource_user_finish_reclamation(grpc_exec_ctx *exec_ctx,
void grpc_resource_user_slice_allocator_init(
grpc_resource_user_slice_allocator *slice_allocator,
grpc_resource_user *resource_user, grpc_iomgr_cb_func cb, void *p) {
- grpc_closure_init(
- &slice_allocator->on_allocated, ru_allocated_slices, slice_allocator,
- grpc_combiner_scheduler(resource_user->resource_quota->combiner, false));
- grpc_closure_init(
- &slice_allocator->on_done, cb, p,
- grpc_combiner_scheduler(resource_user->resource_quota->combiner, false));
+ grpc_closure_init(&slice_allocator->on_allocated, ru_allocated_slices,
+ slice_allocator, grpc_schedule_on_exec_ctx);
+ grpc_closure_init(&slice_allocator->on_done, cb, p,
+ grpc_schedule_on_exec_ctx);
slice_allocator->resource_user = resource_user;
}