RDS: Mark message mapped before transmit

rds_send_xmit() marks the rds message map flag after
xmit_[rdma/atomic]() which is clearly wrong.  We need
to maintain the ownership between transport and rds.

Also take care of error path.

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 dd901c324edf8f7d6cdb30b5dd795d6ad828d44c..faad1be61ab6bd21a186cb805e5b6b472dc73bb8 100644 (file)
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -282,26 +282,34 @@ restart:
                /* The transport either sends the whole rdma or none of it */
                if (rm->rdma.op_active && !conn->c_xmit_rdma_sent) {
                        rm->m_final_op = &rm->rdma;
+                       /* The transport owns the mapped memory for now.
+                        * You can't unmap it while it's on the send queue
+                        */
+                       set_bit(RDS_MSG_MAPPED, &rm->m_flags);
                        ret = conn->c_trans->xmit_rdma(conn, &rm->rdma);
-                       if (ret)
+                       if (ret) {
+                               clear_bit(RDS_MSG_MAPPED, &rm->m_flags);
+                               wake_up_interruptible(&rm->m_flush_wait);
                                break;
+                       }
                        conn->c_xmit_rdma_sent = 1;
 
-                       /* The transport owns the mapped memory for now.
-                        * You can't unmap it while it's on the send queue */
-                       set_bit(RDS_MSG_MAPPED, &rm->m_flags);
                }
 
                if (rm->atomic.op_active && !conn->c_xmit_atomic_sent) {
                        rm->m_final_op = &rm->atomic;
+                       /* The transport owns the mapped memory for now.
+                        * You can't unmap it while it's on the send queue
+                        */
+                       set_bit(RDS_MSG_MAPPED, &rm->m_flags);
                        ret = conn->c_trans->xmit_atomic(conn, &rm->atomic);
-                       if (ret)
+                       if (ret) {
+                               clear_bit(RDS_MSG_MAPPED, &rm->m_flags);
+                               wake_up_interruptible(&rm->m_flush_wait);
                                break;
+                       }
                        conn->c_xmit_atomic_sent = 1;
 
-                       /* The transport owns the mapped memory for now.
-                        * You can't unmap it while it's on the send queue */
-                       set_bit(RDS_MSG_MAPPED, &rm->m_flags);
                }
 
                /*