r1339 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches

Jens Schmalzing jensen@haydn.debian.org
Thu, 26 Aug 2004 03:10:02 -0600


Author: jensen
Date: 2004-08-26 03:09:45 -0600 (Thu, 26 Aug 2004)
New Revision: 1339

Added:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/SG_IO-safe-commands-2.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-4
Log:
Fixed the compile error triggered by the updated list of SCSI commands.

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-08-26 08:29:41 UTC (rev 1338)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-08-26 09:09:45 UTC (rev 1339)
@@ -3,8 +3,12 @@
   * Added patch by Alex Clausen to stop spurious mouse button events
     on older ADB using pmac notebooks (Sven Luther).
 
- -- Sven Luther <luther@debian.org>  Thu, 26 Aug 2004 10:03:17 +0200
+  * Added two SCSI commands, namely VERIFY_16 and GPCMD_SEND_CUE_SHEET,
+    that were mentioned in the list from 2.6.9-rc1 but missing from the
+    corresponding header files (closes: #268128) (Jens Schmalzing).
 
+ -- Jens Schmalzing <jensen@debian.org>  Thu, 26 Aug 2004 11:07:55 +0200
+
 kernel-source-2.6.8 (2.6.8-3) unstable; urgency=high
 
   * Suggest libqt3-dev for xconfig (closes: #261784) (Andres Salomon).

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-4
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-4	2004-08-26 08:29:41 UTC (rev 1338)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-4	2004-08-26 09:09:45 UTC (rev 1339)
@@ -24,7 +24,7 @@
 powerpc-pegasos
 powerpc-g4-l2-flush-errata
 nfs-fix
-SG_IO-safe-commands
+SG_IO-safe-commands-2
 ia64-generic-no-smp
 ptmx-fix
 powerpc-ibm-240-e30

Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/SG_IO-safe-commands-2.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/SG_IO-safe-commands-2.dpatch	2004-08-26 08:29:41 UTC (rev 1338)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/SG_IO-safe-commands-2.dpatch	2004-08-26 09:09:45 UTC (rev 1339)
@@ -0,0 +1,90 @@
+#! /bin/sh -e 
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: Update list of safe SCSI commands for SG_IO
+## DP: Patch author: Linux Torvalds, Jens Axboe
+## DP: Upstream status: backport
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+--- linux-2.6.8/drivers/block/scsi_ioctl.c	2004-08-25 11:54:11.000000000 +0200
++++ linux-2.5/drivers/block/scsi_ioctl.c	2004-08-25 00:31:03.000000000 +0200
+@@ -127,12 +127,16 @@
+ 		safe_for_read(MODE_SENSE),
+ 		safe_for_read(MODE_SENSE_10),
+ 		safe_for_read(START_STOP),
++		safe_for_read(GPCMD_VERIFY_10),
++		safe_for_read(VERIFY_16),
++		safe_for_read(READ_BUFFER),
+ 
+ 		/* Audio CD commands */
+ 		safe_for_read(GPCMD_PLAY_CD),
+ 		safe_for_read(GPCMD_PLAY_AUDIO_10),
+ 		safe_for_read(GPCMD_PLAY_AUDIO_MSF),
+ 		safe_for_read(GPCMD_PLAY_AUDIO_TI),
++		safe_for_read(GPCMD_PAUSE_RESUME),
+ 
+ 		/* CD/DVD data reading */
+ 		safe_for_read(GPCMD_READ_CD),
+@@ -146,6 +150,12 @@
+ 		safe_for_read(GPCMD_READ_TOC_PMA_ATIP),
+ 		safe_for_read(GPCMD_REPORT_KEY),
+ 		safe_for_read(GPCMD_SCAN),
++		safe_for_read(GPCMD_GET_CONFIGURATION),
++		safe_for_read(GPCMD_READ_FORMAT_CAPACITIES),
++		safe_for_read(GPCMD_GET_EVENT_STATUS_NOTIFICATION),
++		safe_for_read(GPCMD_GET_PERFORMANCE),
++		safe_for_read(GPCMD_SEEK),
++		safe_for_read(GPCMD_STOP_PLAY_SCAN),
+ 
+ 		/* Basic writing commands */
+ 		safe_for_write(WRITE_6),
+@@ -154,8 +164,25 @@
+ 		safe_for_write(WRITE_12),
+ 		safe_for_write(WRITE_VERIFY_12),
+ 		safe_for_write(WRITE_16),
+-		safe_for_write(WRITE_BUFFER),
+ 		safe_for_write(WRITE_LONG),
++		safe_for_write(ERASE),
++		safe_for_write(GPCMD_MODE_SELECT_10),
++		safe_for_write(MODE_SELECT),
++		safe_for_write(GPCMD_BLANK),
++		safe_for_write(GPCMD_CLOSE_TRACK),
++		safe_for_write(GPCMD_FLUSH_CACHE),
++		safe_for_write(GPCMD_FORMAT_UNIT),
++		safe_for_write(GPCMD_REPAIR_RZONE_TRACK),
++		safe_for_write(GPCMD_RESERVE_RZONE_TRACK),
++		safe_for_write(GPCMD_SEND_DVD_STRUCTURE),
++		safe_for_write(GPCMD_SEND_EVENT),
++		safe_for_write(GPCMD_SEND_KEY),
++		safe_for_write(GPCMD_SEND_OPC),
++		safe_for_write(GPCMD_SEND_CUE_SHEET),
++		safe_for_write(GPCMD_SET_SPEED),
++		safe_for_write(GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL),
++		safe_for_write(GPCMD_LOAD_UNLOAD),
++		safe_for_write(GPCMD_SET_STREAMING),
+ 	};
+ 	unsigned char type = cmd_type[cmd[0]];
+ 
+--- linux-2.6.8/include/linux/cdrom.h	2004-08-26 09:15:56.891296646 +0200
++++ linux-2.6.8/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
+--- linux-2.6.8/include/scsi/scsi.h	2004-08-25 19:55:21.000000000 +0200
++++ linux-2.6.8/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