diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 13:32:23 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 13:32:23 +1100 |
| commit | 509a2a65821b2dcc67030aa12792c88c45174d1a (patch) | |
| tree | 0612889cfa1514e03630069fbbad96d5beee7f18 /block | |
| parent | 5220c87d9995479df9aded33841d9d9bac523ece (diff) | |
| parent | 00fa2b191b4bd74e9d22ac177e3d9e8ecd3582d3 (diff) | |
Merge remote-tracking branch 'scsi/master'
Conflicts:
drivers/scsi/libsas/sas_ata.c
drivers/scsi/libsas/sas_scsi_host.c
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-core.c | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 2f4002f79a24..b3cf121f1de9 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -2044,9 +2044,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); |