02_scsi_timer_eh_timer_remove_spurious_if.patch If tests which check if eh_action isn't NULL in both functions are always true. Remove the if's. Signed-off-by: Tejun Heo <htejun@xxxxxxxxx> scsi_error.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) Index: scsi-reqfn-export/drivers/scsi/scsi_error.c =================================================================== --- scsi-reqfn-export.orig/drivers/scsi/scsi_error.c 2005-04-19 23:30:57.000000000 +0900 +++ scsi-reqfn-export/drivers/scsi/scsi_error.c 2005-04-19 23:30:58.000000000 +0900 @@ -436,8 +436,7 @@ static void scsi_eh_times_out(unsigned l SCSI_LOG_ERROR_RECOVERY(3, printk("%s: scmd:%p\n", __FUNCTION__, scmd)); - if (scmd->device->host->eh_action) - up(scmd->device->host->eh_action); + up(scmd->device->host->eh_action); } /** @@ -461,8 +460,7 @@ static void scsi_eh_done(struct scsi_cmn SCSI_LOG_ERROR_RECOVERY(3, printk("%s scmd: %p result: %x\n", __FUNCTION__, scmd, scmd->result)); - if (scmd->device->host->eh_action) - up(scmd->device->host->eh_action); + up(scmd->device->host->eh_action); } } - : send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html