| From 505260b2aee55888a1cb4a68a1cc18172d2085ad Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 6 Sep 2018 10:55:31 +0300 |
| Subject: RDMA/core: Follow correct unregister order between sysfs and cgroup |
| |
| From: Parav Pandit <parav@mellanox.com> |
| |
| [ Upstream commit c715a39541bb399eb03d728a996b224d90ce1336 ] |
| |
| During register_device() init sequence is, |
| (a) register with rdma cgroup followed by |
| (b) register with sysfs |
| |
| Therefore, unregister_device() sequence should follow the reverse order. |
| |
| Signed-off-by: Parav Pandit <parav@mellanox.com> |
| Reviewed-by: Daniel Jurgens <danielj@mellanox.com> |
| Signed-off-by: Leon Romanovsky <leonro@mellanox.com> |
| Signed-off-by: Jason Gunthorpe <jgg@mellanox.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/infiniband/core/device.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c |
| index 6d8ac51a39cc0..6a585c3e21923 100644 |
| --- a/drivers/infiniband/core/device.c |
| +++ b/drivers/infiniband/core/device.c |
| @@ -599,8 +599,8 @@ void ib_unregister_device(struct ib_device *device) |
| } |
| up_read(&lists_rwsem); |
| |
| - ib_device_unregister_rdmacg(device); |
| ib_device_unregister_sysfs(device); |
| + ib_device_unregister_rdmacg(device); |
| |
| mutex_unlock(&device_mutex); |
| |
| -- |
| 2.20.1 |
| |
