Revert "scsi: handle flush errors properly"

popcornmix · popcornmix · commit 5abc55a314f2 · 2014-12-13T15:14:01.000Z
This reverts commit 89fb4cd. See: #703
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
@@ -831,14 +831,6 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
 			scsi_next_command(cmd);
 			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 */

Original file line number	Diff line number	Diff line change
`@@ -831,14 +831,6 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)`
`831`	`831`	`scsi_next_command(cmd);`
`832`	`832`	`return;`
`833`	`833`	`}`
`834`		`- } else if (blk_rq_bytes(req) == 0 && result && !sense_deferred) {`
`835`		`- /*`
`836`		`- * Certain non BLOCK_PC requests are commands that don't`
`837`		`- * actually transfer anything (FLUSH), so cannot use`
`838`		`- * good_bytes != blk_rq_bytes(req) as the signal for an error.`
`839`		`- * This sets the error explicitly for the problem case.`
`840`		`- */`
`841`		`- error = __scsi_error_from_host_byte(cmd, result);`
`842`	`834`	`}`
`843`	`835`
`844`	`836`	`/* no bidi support for !REQ_TYPE_BLOCK_PC yet */`