From: santosh.shilimkar@oracle.com <santosh.shilimkar@oracle.com>
Date: Sat, 22 Aug 2015 22:45:27 +0000 (-0700)
Subject: RDS: check for congestion updates during rds_send_xmit
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0c484240210a8c835a216dbca6f1d690e4094a7c;p=deliverable%2Flinux.git

RDS: check for congestion updates during rds_send_xmit

Ensure we don't keep sending the data if the link is congested.

Reviewed-by: Ajaykumar Hotchandani <ajaykumar.hotchandani@oracle.com>
Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/rds/send.c b/net/rds/send.c
index 2581b8e3dbe7..dd901c324edf 100644
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -411,7 +411,8 @@ over_batch:
 	 */
 	if (ret == 0) {
 		smp_mb();
-		if (!list_empty(&conn->c_send_queue) &&
+		if ((test_bit(0, &conn->c_map_queued) ||
+		     !list_empty(&conn->c_send_queue)) &&
 		    send_gen == conn->c_send_gen) {
 			rds_stats_inc(s_send_lock_queue_raced);
 			goto restart;