linux-next: build failure after merge of the bkl-ioctl tree
in [Kernel]
|
Prev: arch/sh: Fix wrong function prototype for native_cpu_disable
Next: linux-next: manual merge of the block tree with Linus' tree
From: Stephen Rothwell on 30 Apr 2010 13:40 Hi Frédéric, After merging the bkl-ioctl tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/scsi/3w-xxxx.c: In function 'tw_chrdev_ioctl': drivers/scsi/3w-xxxx.c:896: error: 'inode' undeclared (first use in this function) Caused by commit 5c9af160f830a68734f600fc0f90cba35e26727b ("scsi: Push down BKL into ioctl functions"). I have used the version of the blk-ioctl tree from next-20100428 for today. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/
From: John Kacur on 30 Apr 2010 14:40 On Thu, 29 Apr 2010, Stephen Rothwell wrote: > Hi Frédéric, > > After merging the bkl-ioctl tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/scsi/3w-xxxx.c: In function 'tw_chrdev_ioctl': > drivers/scsi/3w-xxxx.c:896: error: 'inode' undeclared (first use in this function) > > Caused by commit 5c9af160f830a68734f600fc0f90cba35e26727b ("scsi: Push > down BKL into ioctl functions"). > > I have used the version of the blk-ioctl tree from next-20100428 for > today. Frederic: did you miss one of my patches to fix the scsi compile problems? The following should have fixed the above: From 3605ca2d1b29511fe1c95b47c4c596f392797585 Mon Sep 17 00:00:00 2001 From: John Kacur <jkacur(a)redhat.com> Date: Tue, 27 Apr 2010 10:47:43 +0200 Subject: [PATCH 04/10] bkl: Fix missing inode tw_chrdev_ioctl due to bkl pushdown Cc: Arnd Bergmann <arnd(a)arndb.de>, Linus Torvalds <torvalds(a)linux-foundation.org>, Frederic Weisbecker <fweisbec(a)gmail.com>, Jan Blunck <jblunck(a)gmail.com>, Thomas Gleixner <tglx(a)linutronix.de> Signed-off-by: John Kacur <jkacur(a)redhat.com> --- drivers/scsi/3w-xxxx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c index 45a737c..2957691 100644 --- a/drivers/scsi/3w-xxxx.c +++ b/drivers/scsi/3w-xxxx.c @@ -890,6 +890,7 @@ static long tw_chrdev_ioctl(struct file *file, unsigned int cmd, unsigned long a unsigned long data_buffer_length_adjusted = 0; unsigned long *cpu_addr; long timeout; + struct inode *inode = file->f_dentry->d_inode; TW_New_Ioctl *tw_ioctl; TW_Passthru *passthru; TW_Device_Extension *tw_dev = tw_device_extension_list[iminor(inode)]; -- 1.6.6.1
From: Frederic Weisbecker on 30 Apr 2010 14:50
On Thu, Apr 29, 2010 at 10:40:56PM +0200, John Kacur wrote: > > > On Thu, 29 Apr 2010, Stephen Rothwell wrote: > > > Hi Fr�d�ric, > > > > After merging the bkl-ioctl tree, today's linux-next build (x86_64 > > allmodconfig) failed like this: > > > > drivers/scsi/3w-xxxx.c: In function 'tw_chrdev_ioctl': > > drivers/scsi/3w-xxxx.c:896: error: 'inode' undeclared (first use in this function) > > > > Caused by commit 5c9af160f830a68734f600fc0f90cba35e26727b ("scsi: Push > > down BKL into ioctl functions"). > > > > I have used the version of the blk-ioctl tree from next-20100428 for > > today. > > Frederic: did you miss one of my patches to fix the scsi compile problems? > > The following should have fixed the above: > > From 3605ca2d1b29511fe1c95b47c4c596f392797585 Mon Sep 17 00:00:00 2001 > From: John Kacur <jkacur(a)redhat.com> > Date: Tue, 27 Apr 2010 10:47:43 +0200 > Subject: [PATCH 04/10] bkl: Fix missing inode tw_chrdev_ioctl due to bkl pushdown > Cc: Arnd Bergmann <arnd(a)arndb.de>, > Linus Torvalds <torvalds(a)linux-foundation.org>, > Frederic Weisbecker <fweisbec(a)gmail.com>, > Jan Blunck <jblunck(a)gmail.com>, > Thomas Gleixner <tglx(a)linutronix.de> > > Signed-off-by: John Kacur <jkacur(a)redhat.com> > --- > drivers/scsi/3w-xxxx.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c > index 45a737c..2957691 100644 > --- a/drivers/scsi/3w-xxxx.c > +++ b/drivers/scsi/3w-xxxx.c > @@ -890,6 +890,7 @@ static long tw_chrdev_ioctl(struct file *file, unsigned int cmd, unsigned long a > unsigned long data_buffer_length_adjusted = 0; > unsigned long *cpu_addr; > long timeout; > + struct inode *inode = file->f_dentry->d_inode; > TW_New_Ioctl *tw_ioctl; > TW_Passthru *passthru; > TW_Device_Extension *tw_dev = tw_device_extension_list[iminor(inode)]; > -- > 1.6.6.1 My bad, I was really sure I integrated all of your fixes, and it even fixed by build. I probably forgot a git-add. Will apply this one, thanks! -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |