rds_send_xmit is called uner a spinlock, lets not do a cond_resched()

Signed-off-by: Chris Mason <chris.mason@oracle.com>
Signed-off-by: Bang Nguyen <bang.nguyen@oracle.com>

diff --git a/net/rds/send.c b/net/rds/send.c
index 2d758fea79516c7750f161faded780acaa43210b..16e26151f3e07a2025f813ed8e013d9477e69c90 100644 (file)
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -193,7 +193,6 @@ restart:
                        same_rm++;
                        if ((same_rm >= 4096) && printk_ratelimit()) {
                                printk(KERN_ERR "RDS: Stuck rm\n");
-                               cond_resched();
                                ret = -EAGAIN;
                                break;
                        }
@@ -421,18 +420,8 @@ over_batch:
                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: