Original patch by Chris Mason
Signed-off-by: Sowmini Varadhan <sowmini.varad...@oracle.com>
---
net/rds/send.c | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/net/rds/send.c b/net/rds/send.c
index aec3f9d..23135a8 100644
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -199,7 +199,6 @@ int rds_send_xmit(struct rds_connection *conn)
same_rm++;
if (same_rm >= 4096) {
printk_ratelimited(KERN_ERR "RDS: Stuck rm\n");
- cond_resched();
ret = -EAGAIN;
break;
}
@@ -427,17 +426,8 @@ int rds_send_xmit(struct rds_connection *conn)
smp_mb();
if (!list_empty(&conn->c_send_queue) &&
send_gen == conn->c_send_gen) {
- cond_resched();
- /* repeat our check after the resched in case
- * someone else was kind enough to empty or process
- * the queue
- */
- smp_mb();
- if (!list_empty(&conn->c_send_queue) &&
- send_gen == conn->c_send_gen) {
- rds_stats_inc(s_send_lock_queue_raced);
- goto restart;
- }
+ rds_stats_inc(s_send_lock_queue_raced);
+ goto restart;
}
}
out:
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
