aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/cdrom/cdrom.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-04-20 10:03:01 -0400
committerJens Axboe <axboe@fb.com>2017-04-20 14:16:10 -0400
commit17d5363b83f8c73ef9109f75a4a9b578f31d842f (patch)
tree07eabf4d2ef1bbba0f5db8dcd8dba4178b5f502c /drivers/cdrom/cdrom.c
parentd19633d5375b8f4735c389c80865dfbf0474992a (diff)
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>
Diffstat (limited to 'drivers/cdrom/cdrom.c')
-rw-r--r--drivers/cdrom/cdrom.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 308501730ab3..76c952fd9ab9 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -2219,7 +2219,7 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf,
2219 bio = rq->bio; 2219 bio = rq->bio;
2220 2220
2221 blk_execute_rq(q, cdi->disk, rq, 0); 2221 blk_execute_rq(q, cdi->disk, rq, 0);
2222 if (rq->errors) { 2222 if (scsi_req(rq)->result) {
2223 struct request_sense *s = req->sense; 2223 struct request_sense *s = req->sense;
2224 ret = -EIO; 2224 ret = -EIO;
2225 cdi->last_sense = s->sense_key; 2225 cdi->last_sense = s->sense_key;