Commit 89fb4cd1 authored by James Bottomley's avatar James Bottomley Committed by Christoph Hellwig

scsi: handle flush errors properly

Flush commands don't transfer data and thus need to be special cased
in the I/O completion handler so that we can propagate errors to
the block layer and filesystem.
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
Reported-by: default avatarSteven Haber <steven@qumulo.com>
Tested-by: default avatarSteven Haber <steven@qumulo.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 59ca9ee4
...@@ -733,6 +733,14 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes) ...@@ -733,6 +733,14 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
scsi_next_command(cmd); scsi_next_command(cmd);
return; return;
} }
} else if (blk_rq_bytes(req) == 0 && result && !sense_deferred) {
/*
* Certain non BLOCK_PC requests are commands that don't
* actually transfer anything (FLUSH), so cannot use
* good_bytes != blk_rq_bytes(req) as the signal for an error.
* This sets the error explicitly for the problem case.
*/
error = __scsi_error_from_host_byte(cmd, result);
} }
/* no bidi support for !REQ_TYPE_BLOCK_PC yet */ /* no bidi support for !REQ_TYPE_BLOCK_PC yet */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment