Skip to content

Commit

Permalink
IB/ucm: Use stack variable 'devnum' in ib_ucm_add_one
Browse files Browse the repository at this point in the history
This change is not useful by itself, but sets us up for a future
change that allows us to dynamically allocate device numbers in case
we have more than IB_UCM_MAX_DEVICES in the system.

Signed-off-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
  • Loading branch information
Alexander Chiang authored and Roland Dreier committed Feb 24, 2010
1 parent d3f2c67 commit dd08f70
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions drivers/infiniband/core/ucm.c
Original file line number Diff line number Diff line change
Expand Up @@ -1239,6 +1239,7 @@ static DEVICE_ATTR(ibdev, S_IRUGO, show_ibdev, NULL);

static void ib_ucm_add_one(struct ib_device *device)
{
int devnum;
struct ib_ucm_device *ucm_dev;

if (!device->alloc_ucontext ||
Expand All @@ -1251,16 +1252,17 @@ static void ib_ucm_add_one(struct ib_device *device)

ucm_dev->ib_dev = device;

ucm_dev->devnum = find_first_zero_bit(dev_map, IB_UCM_MAX_DEVICES);
if (ucm_dev->devnum >= IB_UCM_MAX_DEVICES)
devnum = find_first_zero_bit(dev_map, IB_UCM_MAX_DEVICES);
if (devnum >= IB_UCM_MAX_DEVICES)
goto err;

set_bit(ucm_dev->devnum, dev_map);
ucm_dev->devnum = devnum;
set_bit(devnum, dev_map);

cdev_init(&ucm_dev->cdev, &ucm_fops);
ucm_dev->cdev.owner = THIS_MODULE;
kobject_set_name(&ucm_dev->cdev.kobj, "ucm%d", ucm_dev->devnum);
if (cdev_add(&ucm_dev->cdev, IB_UCM_BASE_DEV + ucm_dev->devnum, 1))
if (cdev_add(&ucm_dev->cdev, IB_UCM_BASE_DEV + devnum, 1))
goto err;

ucm_dev->dev.class = &cm_class;
Expand All @@ -1281,7 +1283,7 @@ static void ib_ucm_add_one(struct ib_device *device)
device_unregister(&ucm_dev->dev);
err_cdev:
cdev_del(&ucm_dev->cdev);
clear_bit(ucm_dev->devnum, dev_map);
clear_bit(devnum, dev_map);
err:
kfree(ucm_dev);
return;
Expand Down

0 comments on commit dd08f70

Please sign in to comment.