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

[Christoph Hellwig]

Author: hch-guest
Date: 2004-08-25 04:08:38 -0600 (Wed, 25 Aug 2004)
New Revision: 1302

Added:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/SG_IO-safe-commands.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-3
Log:

  * Update list of safe SCSI commands for SG_IO to match 2.6.9-rc1
    (Christoph Hellwig).



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-25 10:00:29 UTC (rev 1301)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-08-25 10:08:38 UTC (rev 1302)
@@ -29,6 +29,9 @@
   * Update bio_uncopy_user-memleak to really fix the problem
     (closes: #267464) (Christoph Hellwig).
 
+  * Update list of safe SCSI commands for SG_IO to match 2.6.9-rc1
+    (Christoph Hellwig).
+
  -- Andres Salomon <dilinger@voxel.net>  Wed, 18 Aug 2004 02:13:56 -0400
 
 kernel-source-2.6.8 (2.6.8-2) unstable; urgency=high

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-3
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-3	2004-08-25 10:00:29 UTC (rev 1301)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-3	2004-08-25 10:08:38 UTC (rev 1302)
@@ -23,7 +23,7 @@
 powerpc-pegasos
 powerpc-g4-l2-flush-errata
 nfs-fix
-SG_IO-cap
+SG_IO-safe-commands
 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.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/SG_IO-safe-commands.dpatch	2004-08-25 10:00:29 UTC (rev 1301)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/SG_IO-safe-commands.dpatch	2004-08-25 10:08:38 UTC (rev 1302)
@@ -0,0 +1,70 @@
+#! /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]];
+