From 135effc52627fe9d551e6820f6095b62ae320300 Mon Sep 17 00:00:00 2001 From: Andy Grover Date: Thu, 9 Apr 2009 14:09:41 +0000 Subject: [PATCH] --- yaml --- r: 149715 b: refs/heads/master c: 49f696914100780f6bf8e652d3468de0015d6172 h: refs/heads/master i: 149713: 8c2c3e289c194bb8eb51f4feae308e4e896620f8 149711: f8deddce3b9bb9f097163a11aefe43a5a7a18fd5 v: v3 --- [refs] | 2 +- trunk/net/rds/send.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 8747ae2cceb5..a730417fd5ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7acd4a794c1530af063e51f3f7171e75556458f3 +refs/heads/master: 49f696914100780f6bf8e652d3468de0015d6172 diff --git a/trunk/net/rds/send.c b/trunk/net/rds/send.c index 104fe033203d..a4a7f428cd76 100644 --- a/trunk/net/rds/send.c +++ b/trunk/net/rds/send.c @@ -854,11 +854,6 @@ int rds_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, 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; - /* rds_conn_create has a spinlock that runs with IRQ off. * Caching the conn in the socket helps a lot. */ if (rs->rs_conn && rs->rs_conn->c_faddr == daddr) @@ -874,6 +869,11 @@ int rds_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, rs->rs_conn = conn; } + /* Parse any control messages the user may have included. */ + ret = rds_cmsg_send(rs, rm, msg, &allocated_mr); + if (ret) + goto out; + if ((rm->m_rdma_cookie || rm->m_rdma_op) && conn->c_trans->xmit_rdma == NULL) { if (printk_ratelimit())