diff options
| author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2011-03-12 10:02:30 +0100 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2011-03-12 10:02:30 +0100 |
| commit | 6d9a4f9e21486fa83526a9a9fdf88b9b2cdfd299 (patch) | |
| tree | f68adf8d3e17b7f47b04a48d2361efcfa29e813a /drivers/block/cciss.c | |
| parent | fcab1c112ade881d884cd7b8161f7543194d12e1 (diff) | |
| download | lwn-6d9a4f9e21486fa83526a9a9fdf88b9b2cdfd299.tar.gz lwn-6d9a4f9e21486fa83526a9a9fdf88b9b2cdfd299.zip | |
cciss: fix missed command status value CMD_UNABORTABLE
and fix a nearby typo, "do" that should have been "due"
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/block/cciss.c')
| -rw-r--r-- | drivers/block/cciss.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 25267e92ce31..9bf13988f1a2 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -2691,6 +2691,10 @@ static int process_sendcmd_error(ctlr_info_t *h, CommandList_struct *c) c->Request.CDB[0]); return_status = IO_NEEDS_RETRY; break; + case CMD_UNABORTABLE: + dev_warn(&h->pdev->dev, "cmd unabortable\n"); + return_status = IO_ERROR; + break; default: dev_warn(&h->pdev->dev, "cmd 0x%02x returned " "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) ? DID_PASSTHROUGH : DID_ERROR); 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: dev_warn(&h->pdev->dev, "cmd %p returned " "unknown status %x\n", cmd, |