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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <alpine.LFD.2.00.1004292239320.8472@localhost.localdomain>
Date:	Thu, 29 Apr 2010 22:40:56 +0200 (CEST)
From:	John Kacur <jkacur@...hat.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
cc:	"Frédéric Weisbecker" 
	<fweisbec@...il.com>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Arnd Bergmann <arnd@...db.de>
Subject: Re: linux-next: build failure after merge of the bkl-ioctl tree



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@...hat.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@...db.de>,
    Linus Torvalds <torvalds@...ux-foundation.org>,
    Frederic Weisbecker <fweisbec@...il.com>,
    Jan Blunck <jblunck@...il.com>,
    Thomas Gleixner <tglx@...utronix.de>

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