Re: linux-next: build failure after merge of the bkl-ioctl tree

[John Kacur <jkacur@redhat.com>]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 1732 bytes --]



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@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@arndb.de>,
    Linus Torvalds <torvalds@linux-foundation.org>,
    Frederic Weisbecker <fweisbec@gmail.com>,
    Jan Blunck <jblunck@gmail.com>,
    Thomas Gleixner <tglx@linutronix.de>

Signed-off-by: John Kacur <jkacur@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