From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756861Ab0GNNPr (ORCPT <rfc822;w@1wt.eu>);
	Wed, 14 Jul 2010 09:15:47 -0400
Received: from cantor2.suse.de ([195.135.220.15]:57220 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1756525Ab0GNNPp (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Wed, 14 Jul 2010 09:15:45 -0400
Date: Wed, 14 Jul 2010 15:15:43 +0200
Message-ID: <s5h8w5e4328.wl%tiwai@suse.de>
From: Takashi Iwai <tiwai@suse.de>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Randy Dunlap <randy.dunlap@oracle.com>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Jaroslav Kysela <perex@perex.cz>, linux-next@vger.kernel.org,
        LKML <linux-kernel@vger.kernel.org>
Subject: Re: sound/oss-msnd-pinnacle: ioctl needs the inode
In-Reply-To: <201007141511.39507.arnd@arndb.de>
References: <20100713144007.55d3abc9.sfr@canb.auug.org.au>
	<20100713103623.bfb0d9b8.randy.dunlap@oracle.com>
	<201007141511.39507.arnd@arndb.de>
User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka)
 FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.1
 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

At Wed, 14 Jul 2010 15:11:39 +0200,
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 <arnd@arndb.de>

Applied now.  Thanks.


Takashi

> ---
> 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) {
>