rpms/kernel/F-9 linux-2.6-libata-sff-kill-spurious-WARN_ON-in-ata_hsm_move.patch, NONE, 1.1 kernel.spec, 1.769, 1.770

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29747

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-libata-sff-kill-spurious-WARN_ON-in-ata_hsm_move.patch 
Log Message:
* Fri Sep 19 2008 Kyle McMartin <kyle at redhat.com> - 2.6.26.5-43
- libata-sff: kill spurious WARN_ON() in ata_hsm_move()
   Pointed-out-by: Arjan van de Ven (9c2676b61a5a4b6d99e65fb2f438fb3914302eda)


linux-2.6-libata-sff-kill-spurious-WARN_ON-in-ata_hsm_move.patch:

--- NEW FILE linux-2.6-libata-sff-kill-spurious-WARN_ON-in-ata_hsm_move.patch ---
>From 9c2676b61a5a4b6d99e65fb2f438fb3914302eda Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj at kernel.org>
Date: Fri, 29 Aug 2008 16:27:43 +0200
Subject: [PATCH] libata-sff: kill spurious WARN_ON() in ata_hsm_move()

On HSM_ST_ERR, ata_hsm_move() triggers WARN_ON() if AC_ERR_DEV or
AC_ERR_HSM is not set.  PHY events may trigger HSM_ST_ERR with other
error codes and, with or without it, there just isn't much reason to
do WARN_ON() on it.  Even if error code is not set there, core EH
logic won't have any problem dealing with the error condition.

OSDL bz#11065 reports this problem.

Signed-off-by: Tejun Heo <tj at kernel.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
---
 drivers/ata/libata-sff.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 304fdc6..2a4c516 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -1315,11 +1315,6 @@ fsm_start:
 		break;
 
 	case HSM_ST_ERR:
-		/* make sure qc->err_mask is available to
-		 * know what's wrong and recover
-		 */
-		WARN_ON(!(qc->err_mask & (AC_ERR_DEV | AC_ERR_HSM)));
-
 		ap->hsm_task_state = HSM_ST_IDLE;
 
 		/* complete taskfile transaction */
-- 
1.5.5.1



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.769
retrieving revision 1.770
diff -u -r1.769 -r1.770
--- kernel.spec	17 Sep 2008 21:59:05 -0000	1.769
+++ kernel.spec	19 Sep 2008 16:49:03 -0000	1.770
@@ -693,6 +693,7 @@
 Patch2600: linux-2.6-merge-efifb-imacfb.patch
 
 Patch2700: linux-2.6-intel-msr-backport.patch
+Patch2701: linux-2.6-libata-sff-kill-spurious-WARN_ON-in-ata_hsm_move.patch
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1277,6 +1278,7 @@
 ApplyPatch linux-2.6-merge-efifb-imacfb.patch
 
 ApplyPatch linux-2.6-intel-msr-backport.patch
+ApplyPatch linux-2.6-libata-sff-kill-spurious-WARN_ON-in-ata_hsm_move.patch
 # ---------- below all scheduled for 2.6.24 -----------------
 
 # END OF PATCH APPLICATIONS
@@ -1868,6 +1870,10 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Fri Sep 19 2008 Kyle McMartin <kyle at redhat.com> - 2.6.26.5-43
+- libata-sff: kill spurious WARN_ON() in ata_hsm_move()
+   Pointed-out-by: Arjan van de Ven (9c2676b61a5a4b6d99e65fb2f438fb3914302eda)
+
 * Wed Sep 17 2008 Kyle McMartin <kyle at redhat.com> - 2.6.26.5-42
 - From Chris Lalancette <clalance at redhat.com>:
    Backport KVM Intel MSR fix (efa67e0d1f51842393606034051d805ab9948abd)