scsi: introduce a result field in struct scsi_request

This passes on the scsi_cmnd result field to users of passthrough
requests.  Currently we abuse req->errors for this purpose, but that
field will go away in its current form.

Note that the old IDE code abuses the errors field in very creative
ways and stores all kinds of different values in it.  I didn't dare
to touch this magic, so the abuses are brought forward 1:1.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Bart Van Assche <Bart.VanAssche@sandisk.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index 1524797e1776..5901937284e7 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -108,7 +108,7 @@ int ide_queue_pc_tail(ide_drive_t *drive, struct gendisk *disk,
         if (drive->media == ide_tape)
                 scsi_req(rq)->cmd[13] = REQ_IDETAPE_PC1;
         blk_execute_rq(drive->queue, disk, rq, 0);
-        error = rq->errors ? -EIO : 0;
+        error = scsi_req(rq)->result ? -EIO : 0;
 put_req:
         blk_put_request(rq);
         return error;
@@ -455,7 +455,7 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
                         debug_log("%s: I/O error\n", drive->name);
 
                         if (drive->media != ide_tape)
-                                pc->rq->errors++;
+                                scsi_req(pc->rq)->result++;
 
                         if (scsi_req(rq)->cmd[0] == REQUEST_SENSE) {
                                 printk(KERN_ERR PFX "%s: I/O error in request "
@@ -489,13 +489,13 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
                         drive->failed_pc = NULL;
 
                 if (ata_misc_request(rq)) {
-                        rq->errors = 0;
+                        scsi_req(rq)->result = 0;
                         error = 0;
                 } else {
 
                         if (blk_rq_is_passthrough(rq) && uptodate <= 0) {
-                                if (rq->errors == 0)
-                                        rq->errors = -EIO;
+                                if (scsi_req(rq)->result == 0)
+                                        scsi_req(rq)->result = -EIO;
                         }
 
                         error = uptodate ? 0 : -EIO;