[kernel] r7797 - in dists/trunk/linux-2.6/debian: . patches/bugfix patches/series

[maximilian attems]

Author: maks-guest
Date: Tue Nov 14 10:23:03 2006
New Revision: 7797

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/scsi-SG_IO-data-direction.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/6
Log:
backport SG_IO fix (cdparanoia testcase)


Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Nov 14 10:23:03 2006
@@ -13,6 +13,7 @@
   * Add another bcm43xx patch queued for 2.6.18.3.
   * Backport upstream nvidiafb patch (maybe fixes 398258).
   * [i386] Enable CONFIG_USB_APPLETOUCH=m (closes: #382298)
+  * Backport fix for bad data direction in SG_IO, fixes cdparanoia.
 
   [ Steve Langasek ]
   * [alpha] new titan-video patch, for compatibility with TITAN and similar
@@ -34,7 +35,7 @@
   [ Thiemo Seufer ]
   * Enable raid456 for mips/mipsel qemu kernel.
 
- -- maximilian attems <maks at sternwelten.at>  Tue, 14 Nov 2006 00:51:23 +0100
+ -- maximilian attems <maks at sternwelten.at>  Tue, 14 Nov 2006 10:20:32 +0100
 
 linux-2.6 (2.6.18-5) unstable; urgency=low
 

Added: dists/trunk/linux-2.6/debian/patches/bugfix/scsi-SG_IO-data-direction.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/scsi-SG_IO-data-direction.patch	Tue Nov 14 10:23:03 2006
@@ -0,0 +1,42 @@
+From git-commits-head-owner at vger.kernel.org Mon Nov 13 21:55:15 2006
+Date: Mon, 13 Nov 2006 17:59:01 GMT
+Message-Id: <200611131759.kADHx1kX004578 at hera.kernel.org>
+From: Linux Kernel Mailing List <linux-kernel at vger.kernel.org>
+To: git-commits-head at vger.kernel.org
+Subject: [PATCH] Fix bad data direction in SG_IO
+
+commit 616e8a091a035c0bd9b871695f4af191df123caa
+tree 9b9c97c6b55a9a097bafb453085375497b916fdc
+parent bf2b3de2a8e66e5f554c2113fac688bcaaca77fb
+author Jens Axboe <jens.axboe at oracle.com> 1163437499 +0100
+committer Linus Torvalds <torvalds at g5.osdl.org> 1163440020 -0800
+
+[PATCH] Fix bad data direction in SG_IO
+
+Contrary to what the name misleads you to believe, SG_DXFER_TO_FROM_DEV
+is really just a normal read seen from the device side.
+
+This patch fixes http://lkml.org/lkml/2006/10/13/100
+
+Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
+Signed-off-by: Linus Torvalds <torvalds at osdl.org>
+
+ block/scsi_ioctl.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
+index 2dc3264..a19338e 100644
+--- a/block/scsi_ioctl.c
++++ b/block/scsi_ioctl.c
+@@ -246,10 +246,10 @@ static int sg_io(struct file *file, requ
+ 		switch (hdr->dxfer_direction) {
+ 		default:
+ 			return -EINVAL;
+-		case SG_DXFER_TO_FROM_DEV:
+ 		case SG_DXFER_TO_DEV:
+ 			writing = 1;
+ 			break;
++		case SG_DXFER_TO_FROM_DEV:
+ 		case SG_DXFER_FROM_DEV:
+ 			break;
+ 		}

Modified: dists/trunk/linux-2.6/debian/patches/series/6
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/6	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/6	Tue Nov 14 10:23:03 2006
@@ -15,3 +15,4 @@
 + features/all/sctp-backports-7.patch
 + bugfix/bcm43xx-drain-tx-status-before-starting-irqs.patch
 + bugfix/video-nvidiafb-divide-zero.patch
++ bugfix/scsi-SG_IO-data-direction.patch