Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI barrier fix from James Bottomley:
 "This is a potential data corruption fix: If we get an error sending
  down a barrier, we simply ignore it meaning the barrier semantics get
  violated without anyone being any the wiser.  If the system crashes at
  this point, the filesystem potentially becomes corrupt.  Fix is to
  report errors on failed barriers"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: handle flush errors properly

1 files changed, 8 insertions, 0 deletions

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index f7e316368c99..3f50dfcb3227 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -733,6 +733,14 @@ 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 */