commit fbc8a81d66bbbce3f0b4d5752f8bc8bb3c1fc439
author Jonathan Corbet <corbet@lwn.net> Thu May 15 10:39:37 2008 -0600
committer Jonathan Corbet <corbet@lwn.net> Fri Jun 20 14:05:47 2008 -0600
tree 7a96eba56ea94a4b2a6ce95f4ad4d8ced0960ed9
parent 2edbf8537edc62c9b0ef75e7025d01e8b6a48707

UIO: cdev lock_kernel() pushdown

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

drivers/uio/uio.c

diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index 55cc7b8..1a0415e 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -297,12 +297,17 @@
 	struct uio_listener *listener;
 	int ret = 0;
 
+	lock_kernel();
 	idev = idr_find(&uio_idr, iminor(inode));
-	if (!idev)
-		return -ENODEV;
+	if (!idev) {
+		ret = -ENODEV;
+		goto out;
+	}
 
-	if (!try_module_get(idev->owner))
-		return -ENODEV;
+	if (!try_module_get(idev->owner)) {
+		ret = -ENODEV;
+		goto out;
+	}
 
 	listener = kmalloc(sizeof(*listener), GFP_KERNEL);
 	if (!listener) {
@@ -319,7 +324,7 @@
 		if (ret)
 			goto err_infoopen;
 	}
-
+	unlock_kernel();
 	return 0;
 
 err_infoopen:
@@ -329,6 +334,8 @@
 
 	module_put(idev->owner);
 
+out:
+	unlock_kernel();
 	return ret;
 }