diff options
| author |  David G. Quintas <dgq@google.com> | 2016-10-30 15:05:57 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-10-30 15:05:57 +0100 |
| commit | de76cdbcb87c6b4e9be099e50703485af09ba785 (patch) | |
| tree | 4f775a6576bafbff55f0c8d83697d265e74855c8 /src/core | |
| parent | 5e257b96e127604b6f19f3efe2b164b3ddb32f59 (diff) | |
| parent | 894db55ab97aac8ea97602af0c06ba0031c3af97 (diff) | |
Merge pull request #8565 from sreecha/linux_porta_failures
resource_quota.c: Fix compiler errors in gcc4.4 and 4.6
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/lib/iomgr/resource_quota.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/lib/iomgr/resource_quota.c b/src/core/lib/iomgr/resource_quota.c index bfc905845d..e39cf28e35 100644 --- 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); } |