| From 69713c42f7cc8b763375c9ce359e7596b9c5592c Mon Sep 17 00:00:00 2001 |
| From: Gao feng <gaofeng@cn.fujitsu.com> |
| Date: Thu, 4 Oct 2012 20:15:49 +0000 |
| Subject: infiniband: pass rdma_cm module to netlink_dump_start |
| |
| |
| From: Gao feng <gaofeng@cn.fujitsu.com> |
| |
| [ Upstream commit 809d5fc9bf6589276a12bd4fd611e4c7ff9940c3 ] |
| |
| set netlink_dump_control.module to avoid panic. |
| |
| Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com> |
| Cc: Roland Dreier <roland@kernel.org> |
| Cc: Sean Hefty <sean.hefty@intel.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/infiniband/core/cma.c | 3 ++- |
| drivers/infiniband/core/netlink.c | 1 + |
| include/rdma/rdma_netlink.h | 1 + |
| 3 files changed, 4 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/infiniband/core/cma.c |
| +++ b/drivers/infiniband/core/cma.c |
| @@ -3451,7 +3451,8 @@ out: |
| } |
| |
| static const struct ibnl_client_cbs cma_cb_table[] = { |
| - [RDMA_NL_RDMA_CM_ID_STATS] = { .dump = cma_get_id_stats }, |
| + [RDMA_NL_RDMA_CM_ID_STATS] = { .dump = cma_get_id_stats, |
| + .module = THIS_MODULE }, |
| }; |
| |
| static int __init cma_init(void) |
| --- a/drivers/infiniband/core/netlink.c |
| +++ b/drivers/infiniband/core/netlink.c |
| @@ -151,6 +151,7 @@ static int ibnl_rcv_msg(struct sk_buff * |
| { |
| struct netlink_dump_control c = { |
| .dump = client->cb_table[op].dump, |
| + .module = client->cb_table[op].module, |
| }; |
| return netlink_dump_start(nls, skb, nlh, &c); |
| } |
| --- a/include/rdma/rdma_netlink.h |
| +++ b/include/rdma/rdma_netlink.h |
| @@ -39,6 +39,7 @@ struct rdma_cm_id_stats { |
| |
| struct ibnl_client_cbs { |
| int (*dump)(struct sk_buff *skb, struct netlink_callback *nlcb); |
| + struct module *module; |
| }; |
| |
| int ibnl_init(void); |