r2350 - in trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian: . patches patches/series

[maximilian attems]

Author: maks-guest
Date: 2005-01-21 19:42:04 +0100 (Fri, 21 Jan 2005)
New Revision: 2350

Added:
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/scsi-ioctl.dpatch
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-5
Modified:
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
Log:
scsi_ioctl: only warn about really unkown opcodes


Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog	2005-01-21 15:53:14 UTC (rev 2349)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog	2005-01-21 18:42:04 UTC (rev 2350)
@@ -3,6 +3,8 @@
   * Change $((exp) | exp) to $( (exp) | exp), so things work with dash
     (Simon Horman) (closes: #291039)
 
+  * scsi_ioctl: only warn about really unknown opcodes. (Maximilian Attems)
+
  -- Simon Horman <horms@debian.org>  Fri, 21 Jan 2005 12:43:05 +0900
 
 kernel-source-2.6.10 (2.6.10-4) unstable; urgency=low

Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/scsi-ioctl.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/scsi-ioctl.dpatch	2005-01-21 15:53:14 UTC (rev 2349)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/scsi-ioctl.dpatch	2005-01-21 18:42:04 UTC (rev 2350)
@@ -0,0 +1,47 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: [PATCH]  scsi_ioctl: only warn about really unknown opcodes 
+## DP: Patch author: torvalds
+## DP: Upstream status: backport
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2005/01/20 07:42:05-08:00 torvalds@ppc970.osdl.org 
+#   scsi_ioctl: only warn about unknown opcodes if they are truly unknown.
+#   
+#   We could screw up and warn for opcodes that weren't write-safe and the
+#   user tried to use without having write permissions.
+#   
+#   Not so bad in itself, but that also destroyed the cmd type information.
+#   
+#   Noticed by Michal Schmidt
+# 
+# drivers/block/scsi_ioctl.c
+#   2005/01/20 07:41:57-08:00 torvalds@ppc970.osdl.org +1 -1
+#   scsi_ioctl: only warn about unknown opcodes if they are truly unknown.
+#   
+#   We could screw up and warn for opcodes that weren't write-safe and the
+#   user tried to use without having write permissions.
+#   
+#   Not so bad in itself, but that also destroyed the cmd type information.
+#   
+#   Noticed by Michal Schmidt
+# 
+diff -Nru a/drivers/block/scsi_ioctl.c b/drivers/block/scsi_ioctl.c
+--- a/drivers/block/scsi_ioctl.c	2005-01-21 10:31:55 -08:00
++++ b/drivers/block/scsi_ioctl.c	2005-01-21 10:31:55 -08:00
+@@ -199,7 +199,7 @@
+ 			return 0;
+ 	}
+ 
+-	if (!(type & CMD_WARNED)) {
++	if (!type) {
+ 		cmd_type[cmd[0]] = CMD_WARNED;
+ 		printk(KERN_WARNING "scsi: unknown opcode 0x%02x\n", cmd[0]);
+ 	}

Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-5
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-5	2005-01-21 15:53:14 UTC (rev 2349)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-5	2005-01-21 18:42:04 UTC (rev 2350)
@@ -0,0 +1 @@
++ scsi-ioctl.dpatch