diff options
| author | Jens Axboe <axboe@fb.com> | 2015-11-05 17:41:16 (GMT) |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-11-07 17:40:46 (GMT) |
| commit | dece16353ef47d8d33f5302bc158072a9d65e26f (patch) | |
| tree | 75438980d0f76c155bab11ddb5f1f1600fcaee13 /drivers/block/ps3vram.c | |
| parent | 8e483ed1342a4ea45b70f0f33ac54eff7a33d918 (diff) | |
| download | linux-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/ps3vram.c')
| -rw-r--r-- | drivers/block/ps3vram.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/block/ps3vram.c b/drivers/block/ps3vram.c index d89fcac..56847fc 100644 --- a/drivers/block/ps3vram.c +++ b/drivers/block/ps3vram.c @@ -598,7 +598,7 @@ out: return next; } -static void ps3vram_make_request(struct request_queue *q, struct bio *bio) +static blk_qc_t ps3vram_make_request(struct request_queue *q, struct bio *bio) { struct ps3_system_bus_device *dev = q->queuedata; struct ps3vram_priv *priv = ps3_system_bus_get_drvdata(dev); @@ -614,11 +614,13 @@ static void ps3vram_make_request(struct request_queue *q, struct bio *bio) spin_unlock_irq(&priv->lock); if (busy) - return; + return BLK_QC_T_NONE; do { bio = ps3vram_do_bio(dev, bio); } while (bio); + + return BLK_QC_T_NONE; } static int ps3vram_probe(struct ps3_system_bus_device *dev) |