浏览代码

libata: make WARN_ON conditions in ata_sff_hsm_move() more strict

WARN_ON()'s in ata_hsm_move() was too liberal and got triggerred when
it shouldn't (e.g. hotplug events at the right moment).  As the HSM
only deals with device errors and state machine violations, make it
check only against them.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Cc: Mark Lord <liml@rtr.ca>
Cc: Albert Lee <albertcc@tw.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Tejun Heo 17 年之前
父节点
当前提交
411cb3869a
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      drivers/ata/libata-sff.c

+ 2 - 2
drivers/ata/libata-sff.c

@@ -1208,7 +1208,7 @@ fsm_start:
 		DPRINTK("ata%u: dev %u command complete, drv_stat 0x%x\n",
 		DPRINTK("ata%u: dev %u command complete, drv_stat 0x%x\n",
 			ap->print_id, qc->dev->devno, status);
 			ap->print_id, qc->dev->devno, status);
 
 
-		WARN_ON(qc->err_mask);
+		WARN_ON(qc->err_mask & (AC_ERR_DEV | AC_ERR_HSM));
 
 
 		ap->hsm_task_state = HSM_ST_IDLE;
 		ap->hsm_task_state = HSM_ST_IDLE;
 
 
@@ -1222,7 +1222,7 @@ fsm_start:
 		/* make sure qc->err_mask is available to
 		/* make sure qc->err_mask is available to
 		 * know what's wrong and recover
 		 * know what's wrong and recover
 		 */
 		 */
-		WARN_ON(qc->err_mask == 0);
+		WARN_ON(!(qc->err_mask & (AC_ERR_DEV | AC_ERR_HSM)));
 
 
 		ap->hsm_task_state = HSM_ST_IDLE;
 		ap->hsm_task_state = HSM_ST_IDLE;