Comment 9 for bug 7612

Message-ID: <20040826090415.GA26777@pegasos>
Date: Thu, 26 Aug 2004 11:04:15 +0200
From: Sven Luther <email address hidden>
To: Bastian Kleineidam <email address hidden>, <email address hidden>
Cc: Debian Bug Tracking System <email address hidden>
Subject: Re: Bug#268128: kernel-source-2.6.8: compile error in drivers/block/scsi_ioctl.c

--a8Wt8u1KmwUX3Y2C
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline

On Thu, Aug 26, 2004 at 10:17:34AM +0200, Bastian Kleineidam wrote:
> Package: kernel-source-2.6.8
> Version: 2.6.8-3
> Severity: normal
>
> Hi,
>
> with the -3 source I get compile errors (-2 compiled fine):
> [...]
> CC drivers/block/scsi_ioctl.o
> drivers/block/scsi_ioctl.c: In function `verify_command':
> drivers/block/scsi_ioctl.c:131: error: `VERIFY_16' undeclared (first use in this function)
> drivers/block/scsi_ioctl.c:131: error: (Each undeclared identifier is reported only once
> drivers/block/scsi_ioctl.c:131: error: for each function it appears in.)
> drivers/block/scsi_ioctl.c:131: error: nonconstant array index in initializer
> drivers/block/scsi_ioctl.c:131: error: (near initialization for `cmd_type')
> drivers/block/scsi_ioctl.c:181: error: `GPCMD_SEND_CUE_SHEET' undeclared (first use in this function)
> drivers/block/scsi_ioctl.c:181: error: nonconstant array index in initializer
> drivers/block/scsi_ioctl.c:181: error: (near initialization for `cmd_type')
> make[4]: *** [drivers/block/scsi_ioctl.o] Error 1
> make[3]: *** [drivers/block] Error 2
> make[2]: *** [drivers] Error 2
> make[2]: Leaving directory `/usr/src/kernel-source-2.6.8'
> make[1]: *** [stamp-build] Error 2
> make[1]: Leaving directory `/usr/src/kernel-source-2.6.8'
> make: *** [kernel] Error 2
>
> I did a recursive grep for both VERIFY_16 and GPCMD_SEND_CUE_SHEET and
> they do not seem to be defined anywhere.
> Perhaps the new safe-for-copy scsi command patch is incomplete?
>
> My .config is attached.
>
> Greetings, Bastian
>
>
> PS: I left the severity normal for now since I don't know if I forgot
> something to include or to patch ;)

The attached patch by Jens Schmalzing fixes this issue, but i would still like
for Christoph to look at it.

Friendly,

Sven Luther

--a8Wt8u1KmwUX3Y2C
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: attachment; filename=scsi-ioctl-patch

--- ./drivers/scsi/scsi_ioctl.c.orig 2004-08-14 07:38:04.000000000 +0200
+++ ./drivers/scsi/scsi_ioctl.c 2004-08-26 09:16:16.682243588 +0200
@@ -6,6 +6,7 @@
  */
 #include <linux/module.h>
 #include <linux/blkdev.h>
+#include <linux/cdrom.h>
 #include <linux/interrupt.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
--- ./include/linux/cdrom.h.orig 2004-08-26 09:15:56.891296646 +0200
+++ ./include/linux/cdrom.h 2004-08-26 09:14:34.434684402 +0200
@@ -468,6 +468,7 @@
 #define GPCMD_RESERVE_RZONE_TRACK 0x53
 #define GPCMD_SCAN 0xba
 #define GPCMD_SEEK 0x2b
+#define GPCMD_SEND_CUE_SHEET 0x5d
 #define GPCMD_SEND_DVD_STRUCTURE 0xad
 #define GPCMD_SEND_EVENT 0xa2
 #define GPCMD_SEND_KEY 0xa3
--- ./include/scsi/scsi.h.orig 2004-08-25 19:55:21.000000000 +0200
+++ ./include/scsi/scsi.h 2004-08-26 09:12:24.594594554 +0200
@@ -111,6 +111,7 @@
 #define WRITE_LONG_2 0xea
 #define READ_16 0x88
 #define WRITE_16 0x8a
+#define VERIFY_16 0x8f
 #define SERVICE_ACTION_IN 0x9e
 /* values for service action in */
 #define SAI_READ_CAPACITY_16 0x10

--a8Wt8u1KmwUX3Y2C--