Re: [PATCH 6/6] procfs: Kill the bkl in ioctl

[Frederic Weisbecker]

On Tue, Mar 30, 2010 at 09:38:11AM +0300, Alexey Dobriyan wrote:
> On Tue, Mar 30, 2010 at 9:20 AM, Frederic Weisbecker <fweisbec@xxxxxxxxx> wrote:
> > --- a/fs/proc/inode.c
> > +++ b/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();
> 
> Then delete the branch.
> Or go through formal feature-removal procedure.


I thought about it. I even started to write something in this
feature-removal file but realized that I can't remove the
.ioctl() callback from file operations. We still need to check
the user hasn't made the mistake of implementing it.

What I can plan as a feature removal, though, is to keep the warning
but don't actually call the ioctl.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/