rds: Fix reference counting on the for xmit_atomic and xmit_rdma
This makes sure we have the proper number of references in
rds_ib_xmit_atomic and rds_ib_xmit_rdma. We also consistently
drop references the same way for all message types as the IOs end.
Signed-off-by: Chris Mason <chris.mason@oracle.com>
diff --git a/net/rds/send.c b/net/rds/send.c
index 5c6d4a0..437f1e7 100644
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -233,13 +233,10 @@
/* The transport either sends the whole rdma or none of it */
if (rm->rdma.op_active && !conn->c_xmit_rdma_sent) {
- rds_message_addref(rm);
rm->m_final_op = &rm->rdma;
ret = conn->c_trans->xmit_rdma(conn, &rm->rdma);
- if (ret) {
- rds_message_put(rm);
+ if (ret)
break;
- }
conn->c_xmit_rdma_sent = 1;
/* The transport owns the mapped memory for now.
@@ -248,13 +245,10 @@
}
if (rm->atomic.op_active && !conn->c_xmit_atomic_sent) {
- rds_message_addref(rm);
rm->m_final_op = &rm->atomic;
ret = conn->c_trans->xmit_atomic(conn, &rm->atomic);
- if (ret) {
- rds_message_put(rm);
+ if (ret)
break;
- }
conn->c_xmit_atomic_sent = 1;
/* The transport owns the mapped memory for now.