aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/rds/rdma.c1
-rw-r--r--net/rds/recv.c4
-rw-r--r--net/rds/send.c2
3 files changed, 3 insertions, 4 deletions
diff --git a/net/rds/rdma.c b/net/rds/rdma.c
index 1929cb8f17d7..4df545a6eab8 100644
--- a/net/rds/rdma.c
+++ b/net/rds/rdma.c
@@ -688,7 +688,6 @@ int rds_cmsg_rdma_dest(struct rds_sock *rs, struct rds_message *rm,
688 */ 688 */
689 r_key = rds_rdma_cookie_key(rm->m_rdma_cookie); 689 r_key = rds_rdma_cookie_key(rm->m_rdma_cookie);
690 690
691
692 spin_lock_irqsave(&rs->rs_rdma_lock, flags); 691 spin_lock_irqsave(&rs->rs_rdma_lock, flags);
693 mr = rds_mr_tree_walk(&rs->rs_rdma_keys, r_key, NULL); 692 mr = rds_mr_tree_walk(&rs->rs_rdma_keys, r_key, NULL);
694 if (!mr) 693 if (!mr)
diff --git a/net/rds/recv.c b/net/rds/recv.c
index 5188763b609b..68800f02aa30 100644
--- a/net/rds/recv.c
+++ b/net/rds/recv.c
@@ -333,10 +333,10 @@ int rds_notify_queue_get(struct rds_sock *rs, struct msghdr *msghdr)
333 333
334 if (msghdr) { 334 if (msghdr) {
335 cmsg.user_token = notifier->n_user_token; 335 cmsg.user_token = notifier->n_user_token;
336 cmsg.status = notifier->n_status; 336 cmsg.status = notifier->n_status;
337 337
338 err = put_cmsg(msghdr, SOL_RDS, RDS_CMSG_RDMA_STATUS, 338 err = put_cmsg(msghdr, SOL_RDS, RDS_CMSG_RDMA_STATUS,
339 sizeof(cmsg), &cmsg); 339 sizeof(cmsg), &cmsg);
340 if (err) 340 if (err)
341 break; 341 break;
342 } 342 }
diff --git a/net/rds/send.c b/net/rds/send.c
index f3f4e79274bf..5bc35d2f40ea 100644
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -150,7 +150,7 @@ int rds_send_xmit(struct rds_connection *conn)
150 */ 150 */
151 if (conn->c_map_bytes) { 151 if (conn->c_map_bytes) {
152 ret = conn->c_trans->xmit_cong_map(conn, conn->c_lcong, 152 ret = conn->c_trans->xmit_cong_map(conn, conn->c_lcong,
153 conn->c_map_offset); 153 conn->c_map_offset);
154 if (ret <= 0) 154 if (ret <= 0)
155 break; 155 break;
156 156