---

yaml --- r: 192260 b: refs/heads/master c: c2f9805 h: refs/heads/master v: v3
git-mirror · May 17, 2010 · 14cd442 · 14cd442
1 parent 0b81b32
commit 14cd442
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d79b6f4de5db0103ceb4734e42ad101d836d61d9
+refs/heads/master: c2f980500a81006173daf3048284b28832858616
diff --git a/trunk/fs/proc/inode.c b/trunk/fs/proc/inode.c
@@ -231,9 +231,9 @@ static long proc_reg_unlocked_ioctl(struct file *file, unsigned int cmd, unsigne
 		if (rv == -ENOIOCTLCMD)
 			rv = -EINVAL;
 	} else if (ioctl) {
-		lock_kernel();
+		WARN_ONCE(1, "Procfs ioctl handlers must use unlocked_ioctl, "
+			  "%pf will be called without the Bkl held\n", ioctl);
 		rv = ioctl(file->f_path.dentry->d_inode, file, cmd, arg);
-		unlock_kernel();
 	}
 
 	pde_users_dec(pde);