Revert "rds_rdma: rds_sendmsg should return EAGAIN if connection not setup"

This reverts commit 3d6e0fed8edc2f5d5439bee22c2fa153096c77ea.

Reverted because fix has bug that affects rds qos threshold
settings.

Orabug: 21664735

Signed-off-by: Rama Nichanamatlu <rama.nichanamatlu@oracle.com>
Acked-by: Ajaykumar Hotchandani <ajaykumar.hotchandani@oracle.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: Mukesh Kacker <mukesh.kacker@oracle.com>

diff --git a/net/rds/send.c b/net/rds/send.c
index bceff290a15a1bce8d611a74f86bf3ad0fda769d..7804a8155149fc8436868730120003d9e0301433 100644 (file)
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -1228,6 +1228,11 @@ int rds_sendmsg(struct socket *sock, struct msghdr *msg, size_t payload_len)
 
        rm->m_daddr = daddr;
 
+       /* Parse any control messages the user may have included. */
+       ret = rds_cmsg_send(rs, rm, msg, &allocated_mr);
+       if (ret)
+               goto out;
+
        if (rm->rdma.op_active)
                total_payload_len += rm->rdma.op_bytes;
 
@@ -1322,16 +1327,6 @@ int rds_sendmsg(struct socket *sock, struct msghdr *msg, size_t payload_len)
                goto out;
        }
 
-       if (!rds_conn_up(conn)) {
-               ret = -EAGAIN;
-               goto out;
-       }
-
-       /* Parse any control messages the user may have included. */
-       ret = rds_cmsg_send(rs, rm, msg, &allocated_mr);
-       if (ret)
-               goto out;
-
        while (!rds_send_queue_rm(rs, conn, rm, rs->rs_bound_port,
                                  dport, &queued)) {
                rds_stats_inc(s_send_queue_full);