Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (170 commits)
  [SCSI] scsi_dh_rdac: Add MD36xxf into device list
  [SCSI] scsi_debug: add consecutive medium errors
  [SCSI] libsas: fix ata list corruption issue
  [SCSI] hpsa: export resettable host attribute
  [SCSI] hpsa: move device attributes to avoid forward declarations
  [SCSI] scsi_debug: Logical Block Provisioning (SBC3r26)
  [SCSI] sd: Logical Block Provisioning update
  [SCSI] Include protection operation in SCSI command trace
  [SCSI] hpsa: fix incorrect PCI IDs and add two new ones (2nd try)
  [SCSI] target: Fix volume size misreporting for volumes > 2TB
  [SCSI] bnx2fc: Broadcom FCoE offload driver
  [SCSI] fcoe: fix broken fcoe interface reset
  [SCSI] fcoe: precedence bug in fcoe_filter_frames()
  [SCSI] libfcoe: Remove stale fcoe-netdev entries
  [SCSI] libfcoe: Move FCOE_MTU definition from fcoe.h to libfcoe.h
  [SCSI] libfc: introduce __fc_fill_fc_hdr that accepts fc_hdr as an argument
  [SCSI] fcoe, libfc: initialize EM anchors list and then update npiv EMs
  [SCSI] Revert "[SCSI] libfc: fix exchange being deleted when the abort itself is timed out"
  [SCSI] libfc: Fixing a memory leak when destroying an interface
  [SCSI] megaraid_sas: Version and Changelog update
  ...

Fix up trivial conflicts due to whitespace differences in
drivers/scsi/libsas/{sas_ata.c,sas_scsi_host.c}

1 files changed, 20 insertions, 3 deletions

diff --git a/block/blk-core.c b/block/blk-core.c
index 518dd423a5fe..a63336d49f30 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -2045,9 +2045,26 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes)
 
         if (error && req->cmd_type == REQ_TYPE_FS &&
             !(req->cmd_flags & REQ_QUIET)) {
-                printk(KERN_ERR "end_request: I/O error, dev %s, sector %llu\n",
-                                req->rq_disk ? req->rq_disk->disk_name : "?",
-                                (unsigned long long)blk_rq_pos(req));
+                char *error_type;
+
+                switch (error) {
+                case -ENOLINK:
+                        error_type = "recoverable transport";
+                        break;
+                case -EREMOTEIO:
+                        error_type = "critical target";
+                        break;
+                case -EBADE:
+                        error_type = "critical nexus";
+                        break;
+                case -EIO:
+                default:
+                        error_type = "I/O";
+                        break;
+                }
+                printk(KERN_ERR "end_request: %s error, dev %s, sector %llu\n",
+                       error_type, req->rq_disk ? req->rq_disk->disk_name : "?",
+                       (unsigned long long)blk_rq_pos(req));
         }
 
         blk_account_io_completion(req, nr_bytes);