2 files changed, 8 insertions, 6 deletions

diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c
index cd7a6cfcab03..2f009d391c29 100644
--- a/net/rds/ib_recv.c
+++ b/net/rds/ib_recv.c
@@ -143,15 +143,16 @@ static int rds_ib_recv_refill_one(struct rds_connection *conn,
         int ret = -ENOMEM;
 
         if (recv->r_ibinc == NULL) {
-                if (atomic_read(&rds_ib_allocation) >= rds_ib_sysctl_max_recv_allocation) {
+                if (!atomic_add_unless(&rds_ib_allocation, 1, rds_ib_sysctl_max_recv_allocation)) {
                         rds_ib_stats_inc(s_ib_rx_alloc_limit);
                         goto out;
                 }
                 recv->r_ibinc = kmem_cache_alloc(rds_ib_incoming_slab,
                                                  kptr_gfp);
-                if (recv->r_ibinc == NULL)
+                if (recv->r_ibinc == NULL) {
+                        atomic_dec(&rds_ib_allocation);
                         goto out;
-                atomic_inc(&rds_ib_allocation);
+                }
                 INIT_LIST_HEAD(&recv->r_ibinc->ii_frags);
                 rds_inc_init(&recv->r_ibinc->ii_inc, conn, conn->c_faddr);
         }
diff --git a/net/rds/iw_recv.c b/net/rds/iw_recv.c
index 8683f5f66c4b..9f98150af19f 100644
--- a/net/rds/iw_recv.c
+++ b/net/rds/iw_recv.c
@@ -143,15 +143,16 @@ static int rds_iw_recv_refill_one(struct rds_connection *conn,
         int ret = -ENOMEM;
 
         if (recv->r_iwinc == NULL) {
-                if (atomic_read(&rds_iw_allocation) >= rds_iw_sysctl_max_recv_allocation) {
+                if (!atomic_add_unless(&rds_iw_allocation, 1, rds_iw_sysctl_max_recv_allocation)) {
                         rds_iw_stats_inc(s_iw_rx_alloc_limit);
                         goto out;
                 }
                 recv->r_iwinc = kmem_cache_alloc(rds_iw_incoming_slab,
                                                  kptr_gfp);
-                if (recv->r_iwinc == NULL)
+                if (recv->r_iwinc == NULL) {
+                        atomic_dec(&rds_iw_allocation);
                         goto out;
-                atomic_inc(&rds_iw_allocation);
+                }
                 INIT_LIST_HEAD(&recv->r_iwinc->ii_frags);
                 rds_inc_init(&recv->r_iwinc->ii_inc, conn, conn->c_faddr);
         }