diff options
| author | Haggai Eran <haggaie@mellanox.com> | 2014-05-18 11:12:24 +0300 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2014-06-04 10:03:49 -0700 |
| commit | 373c0ea181c8d277a4a51bbd705189a6a030b81c (patch) | |
| tree | c6c9604c87f600788930250ac9aa397ca0864df7 /drivers/infiniband/core | |
| parent | 8ec0a0e6b58218bdc1db91dd70ebfcd6ad8dd6cd (diff) | |
| download | linux-373c0ea181c8d277a4a51bbd705189a6a030b81c.tar.gz linux-373c0ea181c8d277a4a51bbd705189a6a030b81c.tar.bz2 linux-373c0ea181c8d277a4a51bbd705189a6a030b81c.zip | |
IB/core: Remove unneeded kobject_get/put calls
The ib_core module will call kobject_get on the parent object of each
kobject it creates. This is redundant since kobject_add does that
anyway.
As a side effect, this patch should fix leaking the ports kobject and
the device kobject during unregister flow, since the previous code
didn't seem to take into account the kobject_get calls on behalf of
the child kobjects.
Signed-off-by: Haggai Eran <haggaie@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband/core')
| -rw-r--r-- | drivers/infiniband/core/sysfs.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c index 7d3292c7b4b4..1f77072fa1fe 100644 --- a/drivers/infiniband/core/sysfs.c +++ b/drivers/infiniband/core/sysfs.c @@ -534,7 +534,7 @@ static int add_port(struct ib_device *device, int port_num, p->port_num = port_num; ret = kobject_init_and_add(&p->kobj, &port_type, - kobject_get(device->ports_parent), + device->ports_parent, "%d", port_num); if (ret) goto err_put; @@ -599,7 +599,6 @@ err_remove_pma: sysfs_remove_group(&p->kobj, &pma_group); err_put: - kobject_put(device->ports_parent); kfree(p); return ret; } @@ -835,7 +834,7 @@ int ib_device_register_sysfs(struct ib_device *device, } device->ports_parent = kobject_create_and_add("ports", - kobject_get(&class_dev->kobj)); + &class_dev->kobj); if (!device->ports_parent) { ret = -ENOMEM; goto err_put; @@ -876,8 +875,6 @@ err_put: } } - kobject_put(&class_dev->kobj); - err_unregister: device_unregister(class_dev); |