diff options
| author | Jens Axboe <axboe@fb.com> | 2015-11-05 18:41:16 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-11-07 18:40:46 +0100 |
| commit | dece16353ef47d8d33f5302bc158072a9d65e26f (patch) | |
| tree | 75438980d0f76c155bab11ddb5f1f1600fcaee13 /drivers/block/zram | |
| parent | Merge tag 'char-misc-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-dece16353ef47d8d33f5302bc158072a9d65e26f.tar.xz linux-dece16353ef47d8d33f5302bc158072a9d65e26f.zip | |
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/zram')
| -rw-r--r-- | drivers/block/zram/zram_drv.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 9fa15bb9d118..4c99b6ba8681 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -894,7 +894,7 @@ out: /* * Handler function for all zram I/O requests. */ -static void zram_make_request(struct request_queue *queue, struct bio *bio) +static blk_qc_t zram_make_request(struct request_queue *queue, struct bio *bio) { struct zram *zram = queue->queuedata; @@ -911,11 +911,12 @@ static void zram_make_request(struct request_queue *queue, struct bio *bio) __zram_make_request(zram, bio); zram_meta_put(zram); - return; + return BLK_QC_T_NONE; put_zram: zram_meta_put(zram); error: bio_io_error(bio); + return BLK_QC_T_NONE; } static void zram_slot_free_notify(struct block_device *bdev, |