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/rsxx | |
| 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/rsxx')
| -rw-r--r-- | drivers/block/rsxx/dev.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/block/rsxx/dev.c b/drivers/block/rsxx/dev.c index 3163e4cdc2cc5..e1b8b7061d2f8 100644 --- a/drivers/block/rsxx/dev.c +++ b/drivers/block/rsxx/dev.c @@ -145,7 +145,7 @@ static void bio_dma_done_cb(struct rsxx_cardinfo *card, } } -static void rsxx_make_request(struct request_queue *q, struct bio *bio) +static blk_qc_t rsxx_make_request(struct request_queue *q, struct bio *bio) { struct rsxx_cardinfo *card = q->queuedata; struct rsxx_bio_meta *bio_meta; @@ -199,7 +199,7 @@ static void rsxx_make_request(struct request_queue *q, struct bio *bio) if (st) goto queue_err; - return; + return BLK_QC_T_NONE; queue_err: kmem_cache_free(bio_meta_pool, bio_meta); @@ -207,6 +207,7 @@ req_err: if (st) bio->bi_error = st; bio_endio(bio); + return BLK_QC_T_NONE; } /*----------------- Device Setup -------------------*/ |