Merge pull request #8565 from sreecha/linux_porta_failures

resource_quota.c: Fix compiler errors in gcc4.4 and 4.6
8 years ago · de76cdbcb8
parent 5e257b96e1 894db55ab9
commit de76cdbcb8
1 changed files with 5 additions and 2 deletions
--- a/src/core/lib/iomgr/resource_quota.c
+++ b/src/core/lib/iomgr/resource_quota.c
@ -166,8 +166,11 @@ static void rq_step(grpc_exec_ctx *exec_ctx, void *rq, grpc_error *error) {
  do {
    if (rq_alloc(exec_ctx, resource_quota)) goto done;
  } while (rq_reclaim_from_per_user_free_pool(exec_ctx, resource_quota));
-  rq_reclaim(exec_ctx, resource_quota, false) ||
-      rq_reclaim(exec_ctx, resource_quota, true);
+
+  if (!rq_reclaim(exec_ctx, resource_quota, false)) {
+    rq_reclaim(exec_ctx, resource_quota, true);
+  }
+
 done:
  grpc_resource_quota_internal_unref(exec_ctx, resource_quota);
 }