From c3a61a06e5c3e952902edaba42c8054345c740b2 Mon Sep 17 00:00:00 2001
From: Andy Grover <andy.grover@oracle.com>
Date: Tue, 12 Jan 2010 10:53:05 -0800
Subject: [PATCH] --- yaml --- r: 214384 b: refs/heads/master c:
 6200ed7799d9225f363f157ab61f1566cfd80e19 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/net/rds/rdma.c | 1 -
 trunk/net/rds/recv.c | 4 ++--
 trunk/net/rds/send.c | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e4a3b693f57e..2e3031267205 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d22faec22c2ab2364fd8fc3c8159b0b5b28b0fd1
+refs/heads/master: 6200ed7799d9225f363f157ab61f1566cfd80e19
diff --git a/trunk/net/rds/rdma.c b/trunk/net/rds/rdma.c
index 1929cb8f17d7..4df545a6eab8 100644
--- a/trunk/net/rds/rdma.c
+++ b/trunk/net/rds/rdma.c
@@ -688,7 +688,6 @@ int rds_cmsg_rdma_dest(struct rds_sock *rs, struct rds_message *rm,
 	 */
 	r_key = rds_rdma_cookie_key(rm->m_rdma_cookie);
 
-
 	spin_lock_irqsave(&rs->rs_rdma_lock, flags);
 	mr = rds_mr_tree_walk(&rs->rs_rdma_keys, r_key, NULL);
 	if (!mr)
diff --git a/trunk/net/rds/recv.c b/trunk/net/rds/recv.c
index 5188763b609b..68800f02aa30 100644
--- a/trunk/net/rds/recv.c
+++ b/trunk/net/rds/recv.c
@@ -333,10 +333,10 @@ int rds_notify_queue_get(struct rds_sock *rs, struct msghdr *msghdr)
 
 		if (msghdr) {
 			cmsg.user_token = notifier->n_user_token;
-			cmsg.status  = notifier->n_status;
+			cmsg.status = notifier->n_status;
 
 			err = put_cmsg(msghdr, SOL_RDS, RDS_CMSG_RDMA_STATUS,
-					sizeof(cmsg), &cmsg);
+				       sizeof(cmsg), &cmsg);
 			if (err)
 				break;
 		}
diff --git a/trunk/net/rds/send.c b/trunk/net/rds/send.c
index f3f4e79274bf..5bc35d2f40ea 100644
--- a/trunk/net/rds/send.c
+++ b/trunk/net/rds/send.c
@@ -150,7 +150,7 @@ int rds_send_xmit(struct rds_connection *conn)
 		 */
 		if (conn->c_map_bytes) {
 			ret = conn->c_trans->xmit_cong_map(conn, conn->c_lcong,
-						conn->c_map_offset);
+							   conn->c_map_offset);
 			if (ret <= 0)
 				break;