From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755883Ab0GNP4W (ORCPT ); Wed, 14 Jul 2010 11:56:22 -0400 Received: from rcsinet10.oracle.com ([148.87.113.121]:62771 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754592Ab0GNP4V (ORCPT ); Wed, 14 Jul 2010 11:56:21 -0400 Message-ID: <4C3DDDCA.50900@oracle.com> Date: Wed, 14 Jul 2010 08:54:50 -0700 From: Randy Dunlap Organization: Oracle Linux Engineering User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.5) Gecko/20091209 Fedora/3.0-3.fc11 Thunderbird/3.0 MIME-Version: 1.0 To: Arnd Bergmann CC: Stephen Rothwell , Takashi Iwai , Jaroslav Kysela , linux-next@vger.kernel.org, LKML Subject: Re: sound/oss-msnd-pinnacle: ioctl needs the inode References: <20100713144007.55d3abc9.sfr@canb.auug.org.au> <20100713103623.bfb0d9b8.randy.dunlap@oracle.com> <201007141511.39507.arnd@arndb.de> In-Reply-To: <201007141511.39507.arnd@arndb.de> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Source-IP: acsmt355.oracle.com [141.146.40.155] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090208.4C3DDE18.0071:SCFMA4539814,ss=1,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 07/14/10 06:11, Arnd Bergmann wrote: > This broke in sound/oss: convert to unlocked_ioctl, when I missed one > of the ioctl functions still using the inode pointer. > > Signed-off-by: Arnd Bergmann Acked-by: Randy Dunlap Thanks. > --- > On Tuesday 13 July 2010, Randy Dunlap wrote: >> On Tue, 13 Jul 2010 14:40:07 +1000 Stephen Rothwell wrote: >> >>> Hi all, >>> >>> Not unexpectedly, we got some conflicts with the arm defconfig files >>> today ... >> >> >> sound/oss/msnd_pinnacle.c:644:error: 'inode' undeclared (first use in this function) >> > > Sorry about that, my fault. Please apply. > > I checked all the other files I touched in the same patch, they either did > not have this problem, or I had done it correctly. > > --- a/sound/oss/msnd_pinnacle.c > +++ b/sound/oss/msnd_pinnacle.c > @@ -641,7 +641,7 @@ static int mixer_ioctl(unsigned int cmd, unsigned long arg) > > static long dev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) > { > - int minor = iminor(inode); > + int minor = iminor(file->f_path.dentry->d_inode); > int ret; > > if (cmd == OSS_GETVERSION) { -- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code ***