From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752247Ab0D0FGl (ORCPT ); Tue, 27 Apr 2010 01:06:41 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:35680 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750994Ab0D0FGi (ORCPT ); Tue, 27 Apr 2010 01:06:38 -0400 Date: Tue, 27 Apr 2010 15:06:36 +1000 From: Stephen Rothwell To: =?UTF-8?B?IkZyw6lkw6lyaWMgV2Vpc2JlY2tlciI=?= Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Linus Torvalds Subject: linux-next: manual merge of the bkl-ioctl tree with the bkl-procfs tree Message-Id: <20100427150636.241eb65b.sfr@canb.auug.org.au> X-Mailer: Sylpheed 3.0.2 (GTK+ 2.20.0; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Frédéric, Today's linux-next merge of the bkl-ioctl tree got a conflict in fs/proc/inode.c between commit 3ab8dfb0802f33741cc4afa6adf7cb30b1cd1761 ("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-ioctl tree. I fixed it up (see below - probably not optimal) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au 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(str rv = unlocked_ioctl(file, cmd, arg); if (rv == -ENOIOCTLCMD) rv = -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 = ioctl(file->f_path.dentry->d_inode, file, cmd, arg); + rv = bkl_ioctl(file->f_path.dentry->d_inode, file, cmd, arg); - unlock_kernel(); } pde_users_dec(pde);