The patch titled cciss: fix bad scsi status reporting. has been removed from the -mm tree. Its filename was cciss-fix-bad-scsi-status-reporting.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: cciss: fix bad scsi status reporting. From: Stephen M. Cameron <scameron@xxxxxxxxxxxxxxxxxx> The SCSI status needs to be shifted left 1 bit, and only needs to be set once. Signed-off-by: Stephen M. Cameron <scameron@xxxxxxxxxxxxxxxxxx> Cc: Jens Axboe <jens.axboe@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/block/cciss_scsi.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff -puN drivers/block/cciss_scsi.c~cciss-fix-bad-scsi-status-reporting drivers/block/cciss_scsi.c --- a/drivers/block/cciss_scsi.c~cciss-fix-bad-scsi-status-reporting +++ a/drivers/block/cciss_scsi.c @@ -728,9 +728,7 @@ complete_scsi_command( CommandList_struc cmd->result = (DID_OK << 16); /* host byte */ cmd->result |= (COMMAND_COMPLETE << 8); /* msg byte */ - /* cmd->result |= (GOOD < 1); */ /* status byte */ - - cmd->result |= (ei->ScsiStatus); + cmd->result |= (ei->ScsiStatus << 1); /* printk("Scsistatus is 0x%02x\n", ei->ScsiStatus); */ /* copy the sense data whether we need to or not. */ @@ -747,18 +745,8 @@ complete_scsi_command( CommandList_struc { case CMD_TARGET_STATUS: /* Pass it up to the upper layers... */ - if( ei->ScsiStatus) - { -#if 0 - printk(KERN_WARNING "cciss: cmd %p " - "has SCSI Status = %x\n", - cp, - ei->ScsiStatus); -#endif - cmd->result |= (ei->ScsiStatus << 1); - } - else { /* scsi status is zero??? How??? */ - + if (ei->ScsiStatus == 0) + cmd->result = DID_NO_CONNECT << 16; /* Ordinarily, this case should never happen, but there is a bug in some released firmware revisions that allows it to happen if, for example, a 4100 backplane loses power and the tape @@ -766,9 +754,6 @@ complete_scsi_command( CommandList_struc kind because we can't show that it wasn't. We will make it look like selection timeout since that is the most common reason for this to occur, and it's severe enough. */ - - cmd->result = DID_NO_CONNECT << 16; - } break; case CMD_DATA_UNDERRUN: /* let mid layer handle it. */ break; _ Patches currently in -mm which might be from scameron@xxxxxxxxxxxxxxxxxx are hpsa-fix-scsi-status-reporting-yet-again.patch cciss-fix-bad-scsi-status-reporting.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html