From: Jonathan Corbet <corbet@lwn.net>
Date: Fri, 16 May 2008 20:01:12 +0000 (-0600)
Subject: infiniband: more BKL pushdown
X-Git-Tag: v2.6.27-rc1~1103^2~101
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=057e7c7ff9f91a36a761588c53826bd6a710aeba;p=linux-2.6

infiniband: more BKL pushdown

Be extra-cautious and protect the remaining open() functions.

Signed-off-by: Jonathan Corbet <corbet@lwn.net>
---

diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
index 3aa2db54ea..1fc17940a7 100644
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@@ -47,6 +47,7 @@
 #include <linux/kref.h>
 #include <linux/compat.h>
 #include <linux/semaphore.h>
+#include <linux/smp_lock.h>
 
 #include <asm/uaccess.h>
 
@@ -783,14 +784,17 @@ static int ib_umad_open(struct inode *inode, struct file *filp)
 	struct ib_umad_file *file;
 	int ret = 0;
 
+	lock_kernel();
 	spin_lock(&port_lock);
 	port = umad_port[iminor(inode) - IB_UMAD_MINOR_BASE];
 	if (port)
 		kref_get(&port->umad_dev->ref);
 	spin_unlock(&port_lock);
 
-	if (!port)
+	if (!port) {
+		unlock_kernel();
 		return -ENXIO;
+	}
 
 	mutex_lock(&port->file_mutex);
 
@@ -819,6 +823,7 @@ static int ib_umad_open(struct inode *inode, struct file *filp)
 
 out:
 	mutex_unlock(&port->file_mutex);
+	unlock_kernel();
 	return ret;
 }
 
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index cc1afa28c1..8ede1e475c 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -45,6 +45,7 @@
 #include <linux/file.h>
 #include <linux/mount.h>
 #include <linux/cdev.h>
+#include <linux/smp_lock.h>
 
 #include <asm/uaccess.h>
 
@@ -616,14 +617,17 @@ static int ib_uverbs_open(struct inode *inode, struct file *filp)
 	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)
+	if (!dev) {
+		unlock_kernel();
 		return -ENXIO;
+	}
 
 	if (!try_module_get(dev->ib_dev->owner)) {
 		ret = -ENODEV;
@@ -644,6 +648,7 @@ static int ib_uverbs_open(struct inode *inode, struct file *filp)
 
 	filp->private_data = file;
 
+	unlock_kernel();
 	return 0;
 
 err_module:
@@ -651,7 +656,7 @@ err_module:
 
 err:
 	kref_put(&dev->ref, ib_uverbs_release_dev);
-
+	unlock_kernel();
 	return ret;
 }