X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fs%2Fproc%2Finode.c;h=aea8502e58a3a247aae6c4ea5a85e99c7da36b03;hb=98c89cdd3a292af3451e47a2a33132f5183861b0;hp=d35b23238fb1902416ff953f87c9edd2a636899c;hpb=0fdf86754f70e813845af4abaa805165ce57a0bb;p=linux-2.6-block.git

diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index d35b23238fb1..aea8502e58a3 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -232,9 +232,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);