diff options
| author | Jens Axboe <axboe@fb.com> | 2015-11-05 10:41:16 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-11-07 10:40:46 -0700 |
| commit | dece16353ef47d8d33f5302bc158072a9d65e26f (patch) | |
| tree | 75438980d0f76c155bab11ddb5f1f1600fcaee13 /drivers/block/pktcdvd.c | |
| parent | 8e483ed1342a4ea45b70f0f33ac54eff7a33d918 (diff) | |
| download | linux-0-day-dece16353ef47d8d33f5302bc158072a9d65e26f.tar.gz linux-0-day-dece16353ef47d8d33f5302bc158072a9d65e26f.tar.xz | |
block: change ->make_request_fn() and users to return a queue cookie
No functional changes in this patch, but it prepares us for returning
a more useful cookie related to the IO that was queued up.
Signed-off-by: Jens Axboe <axboe@fb.com>
Acked-by: Christoph Hellwig <hch@lst.de>
Acked-by: Keith Busch <keith.busch@intel.com>
Diffstat (limited to 'drivers/block/pktcdvd.c')
| -rw-r--r-- | drivers/block/pktcdvd.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index 7be2375db7f26..a7f4abcedee18 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c @@ -2441,7 +2441,7 @@ static void pkt_make_request_write(struct request_queue *q, struct bio *bio) } } -static void pkt_make_request(struct request_queue *q, struct bio *bio) +static blk_qc_t pkt_make_request(struct request_queue *q, struct bio *bio) { struct pktcdvd_device *pd; char b[BDEVNAME_SIZE]; @@ -2467,7 +2467,7 @@ static void pkt_make_request(struct request_queue *q, struct bio *bio) */ if (bio_data_dir(bio) == READ) { pkt_make_request_read(pd, bio); - return; + return BLK_QC_T_NONE; } if (!test_bit(PACKET_WRITABLE, &pd->flags)) { @@ -2499,13 +2499,12 @@ static void pkt_make_request(struct request_queue *q, struct bio *bio) pkt_make_request_write(q, split); } while (split != bio); - return; + return BLK_QC_T_NONE; end_io: bio_io_error(bio); + return BLK_QC_T_NONE; } - - static void pkt_init_queue(struct pktcdvd_device *pd) { struct request_queue *q = pd->disk->queue; |