scsi: introduce a result field in struct scsi_request

[linux-block.git] / drivers / ide / ide-tape.c

diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 3c1b7974d66de7657d357943646293de7c10efff..a0651f948b76ec22e72ad64c74bec0cb39627a8c 100644 (file)
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -366,7 +366,7 @@ static int ide_tape_callback(ide_drive_t *drive, int dsc)
                        err = pc->error;
                }
        }
-       rq->errors = err;
+       scsi_req(rq)->result = err;
 
        return uptodate;
 }
@@ -879,7 +879,7 @@ static int idetape_queue_rw_tail(ide_drive_t *drive, int cmd, int size)
                tape->valid = 0;
 
        ret = size;
-       if (rq->errors == IDE_DRV_ERROR_GENERAL)
+       if (scsi_req(rq)->result == IDE_DRV_ERROR_GENERAL)
                ret = -EIO;
 out_put:
        blk_put_request(rq);
@@ -1136,7 +1136,7 @@ static ssize_t idetape_chrdev_read(struct file *file, char __user *buf,
        ssize_t ret = 0;
        int rc;
 
-       ide_debug_log(IDE_DBG_FUNC, "count %Zd", count);
+       ide_debug_log(IDE_DBG_FUNC, "count %zd", count);
 
        if (tape->chrdev_dir != IDETAPE_DIR_READ) {
                if (test_bit(ilog2(IDE_AFLAG_DETECT_BS), &drive->atapi_flags))
@@ -1195,7 +1195,7 @@ static ssize_t idetape_chrdev_write(struct file *file, const char __user *buf,
        if (tape->write_prot)
                return -EACCES;
 
-       ide_debug_log(IDE_DBG_FUNC, "count %Zd", count);
+       ide_debug_log(IDE_DBG_FUNC, "count %zd", count);
 
        /* Initialize write operation */
        rc = idetape_init_rw(drive, IDETAPE_DIR_WRITE);