openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

IB/uverbs: Use stack variable 'devnum' in ib_uverbs_add_one 

This change is not useful by itself, but it sets us up for a future
change that allows us to dynamically allocate device numbers in case
we have more than IB_UVERBS_MAX_DEVICES in the system.

Signed-off-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
Alexander Chiang 2010-02-02 19:07:59 +00:00 committed by Roland Dreier
parent 2a72f21226
commit 38707980c4
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/infiniband/core/uverbs_main.c
View File

@ -730,6 +730,7 @@ static CLASS_ATTR(abi_version, S_IRUGO, show_abi_version, NULL);
static void ib_uverbs_add_one(struct ib_device *device) static void ib_uverbs_add_one(struct ib_device *device)
{ {
int devnum;
struct ib_uverbs_device *uverbs_dev; struct ib_uverbs_device *uverbs_dev;
if (!device->alloc_ucontext) if (!device->alloc_ucontext)
@ -743,12 +744,13 @@ static void ib_uverbs_add_one(struct ib_device *device)
init_completion(&uverbs_dev->comp); init_completion(&uverbs_dev->comp);
spin_lock(&map_lock); spin_lock(&map_lock);
uverbs_dev->devnum = find_first_zero_bit(dev_map, IB_UVERBS_MAX_DEVICES); devnum = find_first_zero_bit(dev_map, IB_UVERBS_MAX_DEVICES);
if (uverbs_dev->devnum >= IB_UVERBS_MAX_DEVICES) { if (devnum >= IB_UVERBS_MAX_DEVICES) {
spin_unlock(&map_lock); spin_unlock(&map_lock);
goto err; goto err;
} }
set_bit(uverbs_dev->devnum, dev_map); uverbs_dev->devnum = devnum;
set_bit(devnum, dev_map);
spin_unlock(&map_lock); spin_unlock(&map_lock);
uverbs_dev->ib_dev = device; uverbs_dev->ib_dev = device;
@ -758,7 +760,7 @@ static void ib_uverbs_add_one(struct ib_device *device)
uverbs_dev->cdev.owner = THIS_MODULE; uverbs_dev->cdev.owner = THIS_MODULE;
uverbs_dev->cdev.ops = device->mmap ? &uverbs_mmap_fops : &uverbs_fops; uverbs_dev->cdev.ops = device->mmap ? &uverbs_mmap_fops : &uverbs_fops;
kobject_set_name(&uverbs_dev->cdev.kobj, "uverbs%d", uverbs_dev->devnum); kobject_set_name(&uverbs_dev->cdev.kobj, "uverbs%d", uverbs_dev->devnum);
if (cdev_add(&uverbs_dev->cdev, IB_UVERBS_BASE_DEV + uverbs_dev->devnum, 1)) if (cdev_add(&uverbs_dev->cdev, IB_UVERBS_BASE_DEV + devnum, 1))
goto err_cdev; goto err_cdev;
uverbs_dev->dev = device_create(uverbs_class, device->dma_device, uverbs_dev->dev = device_create(uverbs_class, device->dma_device,
@ -781,7 +783,7 @@ static void ib_uverbs_add_one(struct ib_device *device)
err_cdev: err_cdev:
cdev_del(&uverbs_dev->cdev); cdev_del(&uverbs_dev->cdev);
clear_bit(uverbs_dev->devnum, dev_map); clear_bit(devnum, dev_map);
err: err:
kref_put(&uverbs_dev->ref, ib_uverbs_release_dev); kref_put(&uverbs_dev->ref, ib_uverbs_release_dev);