From 4f2f3973832f64d61194a578712014297408d9bd Mon Sep 17 00:00:00 2001
From: Nir Muchtar <nirm@voltaire.com>
Date: Thu, 13 Jan 2011 13:56:04 +0000
Subject: [PATCH] --- yaml --- r: 251896 b: refs/heads/master c:
 83e9502d8db142822f3302e6a46a45082d3a27b7 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/infiniband/core/cma.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4edbd75b9831..d3a3eca6ea21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 753f618ae03a699cc30044d64eea84165016dc6e
+refs/heads/master: 83e9502d8db142822f3302e6a46a45082d3a27b7
diff --git a/trunk/drivers/infiniband/core/cma.c b/trunk/drivers/infiniband/core/cma.c
index 5dd9acb92c3a..b6a33b3c516d 100644
--- a/trunk/drivers/infiniband/core/cma.c
+++ b/trunk/drivers/infiniband/core/cma.c
@@ -133,6 +133,7 @@ struct rdma_id_private {
 	u32			seq_num;
 	u32			qkey;
 	u32			qp_num;
+	pid_t			owner;
 	u8			srq;
 	u8			tos;
 	u8			reuseaddr;
@@ -420,6 +421,7 @@ struct rdma_cm_id *rdma_create_id(rdma_cm_event_handler event_handler,
 	if (!id_priv)
 		return ERR_PTR(-ENOMEM);
 
+	id_priv->owner = task_pid_nr(current);
 	id_priv->state = RDMA_CM_IDLE;
 	id_priv->id.context = context;
 	id_priv->id.event_handler = event_handler;
@@ -2746,6 +2748,9 @@ int rdma_accept(struct rdma_cm_id *id, struct rdma_conn_param *conn_param)
 	int ret;
 
 	id_priv = container_of(id, struct rdma_id_private, id);
+
+	id_priv->owner = task_pid_nr(current);
+
 	if (!cma_comp(id_priv, RDMA_CM_CONNECT))
 		return -EINVAL;
 
@@ -3385,6 +3390,7 @@ static int cma_get_id_stats(struct sk_buff *skb, struct netlink_callback *cb)
 				}
 			}
 
+			id_stats->pid		= id_priv->owner;
 			id_stats->port_space	= id->ps;
 			id_stats->cm_state	= id_priv->state;
 			id_stats->qp_num	= id_priv->qp_num;