From mboxrd@z Thu Jan  1 00:00:00 1970
From: Frederic Weisbecker <fweisbec@gmail.com>
Subject: Re: linux-next: manual merge of the bkl-ioctl tree with the
	bkl-procfs tree
Date: Tue, 27 Apr 2010 07:18:42 +0200
Message-ID: <20100427051841.GF5695@nowhere>
References: <20100427150636.241eb65b.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: QUOTED-PRINTABLE
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mail-ww0-f46.google.com ([74.125.82.46]:51865 "EHLO
	mail-ww0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751139Ab0D0FSp (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Tue, 27 Apr 2010 01:18:45 -0400
Content-Disposition: inline
In-Reply-To: <20100427150636.241eb65b.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>, Linus Torvalds <torvalds@linux-foundation.org>

On Tue, Apr 27, 2010 at 03:06:36PM +1000, Stephen Rothwell wrote:
> Hi Fr=E9d=E9ric,
>=20
> Today's linux-next merge of the bkl-ioctl tree got a conflict in
> fs/proc/inode.c between commit 3ab8dfb0802f33741cc4afa6adf7cb30b1cd17=
61
> ("procfs: Kill the bkl in ioctl") from the bkl-procfs tree and commit
> 1dd97d3d546aa14db7efa5366b21d1336b91379e ("Rename 'struct
> file_operations' 'ioctl' fn pointer to 'bkl_ioctl'") from the bkl-ioc=
tl
> tree.
>=20
> I fixed it up (see below - probably not optimal) and can carry the fi=
x as
> necessary.
> --=20
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
>=20
> diff --cc fs/proc/inode.c
> index aea8502,8e8f813..0000000
> --- a/fs/proc/inode.c
> +++ b/fs/proc/inode.c
> @@@ -231,10 -231,10 +231,10 @@@ static long proc_reg_unlocked_ioctl(s=
tr
>   		rv =3D unlocked_ioctl(file, cmd, arg);
>   		if (rv =3D=3D -ENOIOCTLCMD)
>   			rv =3D -EINVAL;
> - 	} else if (ioctl) {
> + 	} else if (bkl_ioctl) {
>  -		lock_kernel();
>  +		WARN_ONCE(1, "Procfs ioctl handlers must use unlocked_ioctl, "
>  +			  "%pf will be called without the Bkl held\n", bkl_ioctl);
> - 		rv =3D ioctl(file->f_path.dentry->d_inode, file, cmd, arg);
> + 		rv =3D bkl_ioctl(file->f_path.dentry->d_inode, file, cmd, arg);
>  -		unlock_kernel();
>   	}
>  =20
>   	pde_users_dec(pde);


Thanks, looks like the right fix!