Merge branch 'for-rmk-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux

[linux-2.6-omap-h63xx.git] / drivers / infiniband / core / uverbs_main.c

diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index 8ede1e475ce69c016b85acc81a43c096275a5b12..d85af1b670274466f5ec13a518d8011da1cb7da0 100644 (file)
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -32,8 +32,6 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- *
- * $Id: uverbs_main.c 2733 2005-06-28 19:14:34Z roland $
  */
 
 #include <linux/module.h>
@@ -45,7 +43,6 @@
 #include <linux/file.h>
 #include <linux/mount.h>
 #include <linux/cdev.h>
-#include <linux/smp_lock.h>
 
 #include <asm/uaccess.h>
 
@@ -424,7 +421,7 @@ static void ib_uverbs_async_handler(struct ib_uverbs_file *file,
        unsigned long flags;
 
        spin_lock_irqsave(&file->async_file->lock, flags);
-       if (!file->async_file->is_closed) {
+       if (file->async_file->is_closed) {
                spin_unlock_irqrestore(&file->async_file->lock, flags);
                return;
        }
@@ -611,23 +608,32 @@ static int ib_uverbs_mmap(struct file *filp, struct vm_area_struct *vma)
                return file->device->ib_dev->mmap(file->ucontext, vma);
 }
 
+/*
+ * ib_uverbs_open() does not need the BKL:
+ *
+ *  - dev_table[] accesses are protected by map_lock, the
+ *    ib_uverbs_device structures are properly reference counted, and
+ *    everything else is purely local to the file being created, so
+ *    races against other open calls are not a problem;
+ *  - there is no ioctl method to race against;
+ *  - the device is added to dev_table[] as the last part of module
+ *    initialization, the open method will either immediately run
+ *    -ENXIO, or all required initialization will be done.
+ */
 static int ib_uverbs_open(struct inode *inode, struct file *filp)
 {
        struct ib_uverbs_device *dev;
        struct ib_uverbs_file *file;
        int ret;
 
-       lock_kernel();
        spin_lock(&map_lock);
        dev = dev_table[iminor(inode) - IB_UVERBS_BASE_MINOR];
        if (dev)
                kref_get(&dev->ref);
        spin_unlock(&map_lock);
 
-       if (!dev) {
-               unlock_kernel();
+       if (!dev)
                return -ENXIO;
-       }
 
        if (!try_module_get(dev->ib_dev->owner)) {
                ret = -ENODEV;
@@ -648,7 +654,6 @@ static int ib_uverbs_open(struct inode *inode, struct file *filp)
 
        filp->private_data = file;
 
-       unlock_kernel();
        return 0;
 
 err_module:
@@ -656,7 +661,6 @@ err_module:
 
 err:
        kref_put(&dev->ref, ib_uverbs_release_dev);
-       unlock_kernel();
        return ret;
 }
 
@@ -761,13 +765,11 @@ static void ib_uverbs_add_one(struct ib_device *device)
                goto err_cdev;
 
        uverbs_dev->dev = device_create(uverbs_class, device->dma_device,
-                                       uverbs_dev->cdev->dev,
+                                       uverbs_dev->cdev->dev, uverbs_dev,
                                        "uverbs%d", uverbs_dev->devnum);
        if (IS_ERR(uverbs_dev->dev))
                goto err_cdev;
 
-       dev_set_drvdata(uverbs_dev->dev, uverbs_dev);
-
        if (device_create_file(uverbs_dev->dev, &dev_attr_ibdev))
                goto err_class;
        if (device_create_file(uverbs_dev->dev, &dev_attr_abi_version))