commit 1c55919ece40ec0cf7baa280c55273ab7fbea83f
author Sree Kuchibhotla <sreecha@users.noreply.github.com> Sun Oct 30 21:41:34 2016 -0700
committer GitHub <noreply@github.com> Sun Oct 30 21:41:34 2016 -0700
tree 64230e0782288453c18f7b2fc1b7f5d67b269187
parent de76cdbcb87c6b4e9be099e50703485af09ba785
parent 1e088b4219ac2c4e6ef60457bbf0e6db1f09cbd2

Merge pull request #8269 from sreecha/rpc_mgr

RPC Manager: C++ Sync server redesign 

src/core/lib/iomgr/port.h

diff --git a/src/core/lib/iomgr/port.h b/src/core/lib/iomgr/port.h
index c0bb3b5..f1897bb 100644
--- a/src/core/lib/iomgr/port.h
+++ b/src/core/lib/iomgr/port.h
@@ -90,7 +90,6 @@
 #define GRPC_POSIX_SOCKETUTILS
 #endif
 #elif defined(GPR_APPLE)
-#define GRPC_HAVE_IP_PKTINFO 1
 #define GRPC_HAVE_SO_NOSIGPIPE 1
 #define GRPC_HAVE_UNIX_SOCKET 1
 #define GRPC_MSG_IOVLEN_TYPE int
@@ -102,7 +101,6 @@
 #define GRPC_TIMER_USE_GENERIC 1
 #elif defined(GPR_FREEBSD)
 #define GRPC_HAVE_IPV6_RECVPKTINFO 1
-#define GRPC_HAVE_IP_PKTINFO 1
 #define GRPC_HAVE_SO_NOSIGPIPE 1
 #define GRPC_HAVE_UNIX_SOCKET 1
 #define GRPC_POSIX_NO_SPECIAL_WAKEUP_FD 1

src/core/lib/iomgr/resource_quota.c

diff --git a/src/core/lib/iomgr/resource_quota.c b/src/core/lib/iomgr/resource_quota.c
index bfc9058..e39cf28 100644
--- a/src/core/lib/iomgr/resource_quota.c
+++ b/src/core/lib/iomgr/resource_quota.c
@@ -166,8 +166,11 @@
   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);
 }