Commit 6d9a4f9e authored by Stephen M. Cameron's avatar Stephen M. Cameron Committed by Jens Axboe
Browse files

cciss: fix missed command status value CMD_UNABORTABLE 



and fix a nearby typo, "do" that should have been "due"

Signed-off-by: default avatarStephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent fcab1c11

drivers/block/cciss.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -2691,6 +2691,10 @@ static int process_sendcmd_error(ctlr_info_t *h, CommandList_struct *c) 
			c->Request.CDB[0]);

			c->Request.CDB[0]);

		return_status = IO_NEEDS_RETRY;

		return_status = IO_NEEDS_RETRY;

		break;

		break;

	case CMD_UNABORTABLE:

		dev_warn(&h->pdev->dev, "cmd unabortable\n");

		return_status = IO_ERROR;

		break;

	default:

	default:

		dev_warn(&h->pdev->dev, "cmd 0x%02x returned "

		dev_warn(&h->pdev->dev, "cmd 0x%02x returned "

		       "unknown status %x\n", c->Request.CDB[0],

		       "unknown status %x\n", c->Request.CDB[0],
@@ -3141,6 +3145,13 @@ static inline void complete_command(ctlr_info_t *h, CommandList_struct *cmd, 
			(cmd->rq->cmd_type == REQ_TYPE_BLOCK_PC) ?

			(cmd->rq->cmd_type == REQ_TYPE_BLOCK_PC) ?

				DID_PASSTHROUGH : DID_ERROR);

				DID_PASSTHROUGH : DID_ERROR);

		break;

		break;

	case CMD_UNABORTABLE:

		dev_warn(&h->pdev->dev, "cmd %p unabortable\n", cmd);

		rq->errors = make_status_bytes(SAM_STAT_GOOD,

			cmd->err_info->CommandStatus, DRIVER_OK,

			cmd->rq->cmd_type == REQ_TYPE_BLOCK_PC ?

				DID_PASSTHROUGH : DID_ERROR);

		break;

	default:

	default:

		dev_warn(&h->pdev->dev, "cmd %p returned "

		dev_warn(&h->pdev->dev, "cmd %p returned "

		       "unknown status %x\n", cmd,

		       "unknown status %x\n", cmd,

drivers/block/cciss_scsi.c

+11 −2
Original line number Original line Diff line number Diff line
@@ -833,13 +833,18 @@ static void complete_scsi_command(CommandList_struct *c, int timeout, 
			break;

			break;

			case CMD_UNSOLICITED_ABORT:

			case CMD_UNSOLICITED_ABORT:

				cmd->result = DID_ABORT << 16;

				cmd->result = DID_ABORT << 16;

				dev_warn(&h->pdev->dev, "%p aborted do to an "

				dev_warn(&h->pdev->dev, "%p aborted due to an "

					"unsolicited abort\n", c);

					"unsolicited abort\n", c);

			break;

			break;

			case CMD_TIMEOUT:

			case CMD_TIMEOUT:

				cmd->result = DID_TIME_OUT << 16;

				cmd->result = DID_TIME_OUT << 16;

				dev_warn(&h->pdev->dev, "%p timedout\n", c);

				dev_warn(&h->pdev->dev, "%p timedout\n", c);

			break;

			break;

			case CMD_UNABORTABLE:

				cmd->result = DID_ERROR << 16;

				dev_warn(&h->pdev->dev, "c %p command "

					"unabortable\n", c);

			break;

			default:

			default:

				cmd->result = DID_ERROR << 16;

				cmd->result = DID_ERROR << 16;

				dev_warn(&h->pdev->dev,

				dev_warn(&h->pdev->dev,
@@ -1016,11 +1021,15 @@ cciss_scsi_interpret_error(ctlr_info_t *h, CommandList_struct *c) 
		break;

		break;

		case CMD_UNSOLICITED_ABORT:

		case CMD_UNSOLICITED_ABORT:

			dev_warn(&h->pdev->dev,

			dev_warn(&h->pdev->dev,

				"%p aborted do to an unsolicited abort\n", c);

				"%p aborted due to an unsolicited abort\n", c);

		break;

		break;

		case CMD_TIMEOUT:

		case CMD_TIMEOUT:

			dev_warn(&h->pdev->dev, "%p timedout\n", c);

			dev_warn(&h->pdev->dev, "%p timedout\n", c);

		break;

		break;

		case CMD_UNABORTABLE:

			dev_warn(&h->pdev->dev,

				"%p unabortable\n", c);

		break;

		default:

		default:

			dev_warn(&h->pdev->dev,

			dev_warn(&h->pdev->dev,

				"%p returned unknown status %x\n",

				"%p returned unknown status %x\n",