RDMA/CM: move rdma_id_private to cma_priv.h

Move struct rdma_id_private to a new header cma_priv.h so the resource
tracking services in core/nldev.c can read useful information about cm_ids.

Signed-off-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index e66963ca58bddaf02813c4e080f48ad4cf18be00..203519eb0048527a5cae85c9030b76c421ff5eb9 100644 (file)
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -62,6 +62,7 @@
 #include <rdma/iw_cm.h>
 
 #include "core_priv.h"
+#include "cma_priv.h"
 
 MODULE_AUTHOR("Sean Hefty");
 MODULE_DESCRIPTION("Generic RDMA CM Agent");
@@ -327,46 +328,6 @@ struct ib_device *cma_get_ib_dev(struct cma_device *cma_dev)
  * We do this by disabling removal notification while a callback is in process,
  * and reporting it after the callback completes.
  */
-struct rdma_id_private {
-       struct rdma_cm_id       id;
-
-       struct rdma_bind_list   *bind_list;
-       struct hlist_node       node;
-       struct list_head        list; /* listen_any_list or cma_device.list */
-       struct list_head        listen_list; /* per device listens */
-       struct cma_device       *cma_dev;
-       struct list_head        mc_list;
-
-       int                     internal_id;
-       enum rdma_cm_state      state;
-       spinlock_t              lock;
-       struct mutex            qp_mutex;
-
-       struct completion       comp;
-       atomic_t                refcount;
-       struct mutex            handler_mutex;
-
-       int                     backlog;
-       int                     timeout_ms;
-       struct ib_sa_query      *query;
-       int                     query_id;
-       union {
-               struct ib_cm_id *ib;
-               struct iw_cm_id *iw;
-       } cm_id;
-
-       u32                     seq_num;
-       u32                     qkey;
-       u32                     qp_num;
-       pid_t                   owner;
-       u32                     options;
-       u8                      srq;
-       u8                      tos;
-       bool                    tos_set;
-       u8                      reuseaddr;
-       u8                      afonly;
-       enum ib_gid_type        gid_type;
-};
 
 struct cma_multicast {
        struct rdma_id_private *id_priv;

diff --git a/drivers/infiniband/core/cma_priv.h b/drivers/infiniband/core/cma_priv.h
new file mode 100644 (file)
index 0000000..11a41be
--- /dev/null
+++ b/drivers/infiniband/core/cma_priv.h
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2005 Voltaire Inc.  All rights reserved.
+ * Copyright (c) 2002-2005, Network Appliance, Inc. All rights reserved.
+ * Copyright (c) 1999-2005, Mellanox Technologies, Inc. All rights reserved.
+ * Copyright (c) 2005-2006 Intel Corporation.  All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef _CMA_PRIV_H
+#define _CMA_PRIV_H
+
+struct rdma_id_private {
+       struct rdma_cm_id       id;
+
+       struct rdma_bind_list   *bind_list;
+       struct hlist_node       node;
+       struct list_head        list; /* listen_any_list or cma_device.list */
+       struct list_head        listen_list; /* per device listens */
+       struct cma_device       *cma_dev;
+       struct list_head        mc_list;
+
+       int                     internal_id;
+       enum rdma_cm_state      state;
+       spinlock_t              lock;
+       struct mutex            qp_mutex;
+
+       struct completion       comp;
+       atomic_t                refcount;
+       struct mutex            handler_mutex;
+
+       int                     backlog;
+       int                     timeout_ms;
+       struct ib_sa_query      *query;
+       int                     query_id;
+       union {
+               struct ib_cm_id *ib;
+               struct iw_cm_id *iw;
+       } cm_id;
+
+       u32                     seq_num;
+       u32                     qkey;
+       u32                     qp_num;
+       pid_t                   owner;
+       u32                     options;
+       u8                      srq;
+       u8                      tos;
+       bool                    tos_set;
+       u8                      reuseaddr;
+       u8                      afonly;
+       enum ib_gid_type        gid_type;
+};
+#endif /* _CMA_PRIV_H */