From: Arnd Bergmann <arnd@arndb.de>
To: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Takashi Iwai <tiwai@suse.de>, Jaroslav Kysela <perex@perex.cz>,
linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>
Subject: sound/oss-msnd-pinnacle: ioctl needs the inode
Date: Wed, 14 Jul 2010 15:11:39 +0200 [thread overview]
Message-ID: <201007141511.39507.arnd@arndb.de> (raw)
In-Reply-To: <20100713103623.bfb0d9b8.randy.dunlap@oracle.com>
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>
---
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) {
next prev parent reply other threads:[~2010-07-14 13:11 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-13 4:40 linux-next: Tree for July 13 Stephen Rothwell
2010-07-13 17:36 ` linux-next: Tree for July 13 (sound/oss/msnd_pinnacle) Randy Dunlap
2010-07-14 13:11 ` Arnd Bergmann [this message]
2010-07-14 13:15 ` sound/oss-msnd-pinnacle: ioctl needs the inode Takashi Iwai
2010-07-14 15:54 ` Randy Dunlap
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201007141511.39507.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=perex@perex.cz \
--cc=randy.dunlap@oracle.com \
--cc=sfr@canb.auug.org.au \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox