aboutsummaryrefslogtreecommitdiffstats
path: root/net/rds/send.c
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2010-05-11 19:15:35 -0400
committerAndy Grover <andy.grover@oracle.com>2010-09-08 21:15:13 -0400
commit1cc2228c599f173d77000a250bf0541294e1a7be (patch)
treecc84662c1fd550274e8bba759074873b7c8e017d /net/rds/send.c
parentbcf50ef2ce3c5d8f2fe995259da16677898cb300 (diff)
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>
Diffstat (limited to 'net/rds/send.c')
-rw-r--r--net/rds/send.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/net/rds/send.c b/net/rds/send.c
index 5c6d4a0be0d7..437f1e72609c 100644
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -233,13 +233,10 @@ restart:
233 233
234 /* The transport either sends the whole rdma or none of it */ 234 /* The transport either sends the whole rdma or none of it */
235 if (rm->rdma.op_active && !conn->c_xmit_rdma_sent) { 235 if (rm->rdma.op_active && !conn->c_xmit_rdma_sent) {
236 rds_message_addref(rm);
237 rm->m_final_op = &rm->rdma; 236 rm->m_final_op = &rm->rdma;
238 ret = conn->c_trans->xmit_rdma(conn, &rm->rdma); 237 ret = conn->c_trans->xmit_rdma(conn, &rm->rdma);
239 if (ret) { 238 if (ret)
240 rds_message_put(rm);
241 break; 239 break;
242 }
243 conn->c_xmit_rdma_sent = 1; 240 conn->c_xmit_rdma_sent = 1;
244 241
245 /* The transport owns the mapped memory for now. 242 /* The transport owns the mapped memory for now.
@@ -248,13 +245,10 @@ restart:
248 } 245 }
249 246
250 if (rm->atomic.op_active && !conn->c_xmit_atomic_sent) { 247 if (rm->atomic.op_active && !conn->c_xmit_atomic_sent) {
251 rds_message_addref(rm);
252 rm->m_final_op = &rm->atomic; 248 rm->m_final_op = &rm->atomic;
253 ret = conn->c_trans->xmit_atomic(conn, &rm->atomic); 249 ret = conn->c_trans->xmit_atomic(conn, &rm->atomic);
254 if (ret) { 250 if (ret)
255 rds_message_put(rm);
256 break; 251 break;
257 }
258 conn->c_xmit_atomic_sent = 1; 252 conn->c_xmit_atomic_sent = 1;
259 253
260 /* The transport owns the mapped memory for now. 254 /* The transport owns the mapped memory for now.