mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
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 <[email protected]> Acked-by: Christoph Hellwig <[email protected]> Acked-by: Keith Busch <[email protected]>
This commit is contained in:
parent
8e483ed134
commit
dece16353e
28 changed files with 127 additions and 71 deletions
|
|
@ -27,7 +27,8 @@
|
|||
|
||||
static int dcssblk_open(struct block_device *bdev, fmode_t mode);
|
||||
static void dcssblk_release(struct gendisk *disk, fmode_t mode);
|
||||
static void dcssblk_make_request(struct request_queue *q, struct bio *bio);
|
||||
static blk_qc_t dcssblk_make_request(struct request_queue *q,
|
||||
struct bio *bio);
|
||||
static long dcssblk_direct_access(struct block_device *bdev, sector_t secnum,
|
||||
void __pmem **kaddr, unsigned long *pfn);
|
||||
|
||||
|
|
@ -815,7 +816,7 @@ dcssblk_release(struct gendisk *disk, fmode_t mode)
|
|||
up_write(&dcssblk_devices_sem);
|
||||
}
|
||||
|
||||
static void
|
||||
static blk_qc_t
|
||||
dcssblk_make_request(struct request_queue *q, struct bio *bio)
|
||||
{
|
||||
struct dcssblk_dev_info *dev_info;
|
||||
|
|
@ -874,9 +875,10 @@ dcssblk_make_request(struct request_queue *q, struct bio *bio)
|
|||
bytes_done += bvec.bv_len;
|
||||
}
|
||||
bio_endio(bio);
|
||||
return;
|
||||
return BLK_QC_T_NONE;
|
||||
fail:
|
||||
bio_io_error(bio);
|
||||
return BLK_QC_T_NONE;
|
||||
}
|
||||
|
||||
static long
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ static unsigned long xpram_highest_page_index(void)
|
|||
/*
|
||||
* Block device make request function.
|
||||
*/
|
||||
static void xpram_make_request(struct request_queue *q, struct bio *bio)
|
||||
static blk_qc_t xpram_make_request(struct request_queue *q, struct bio *bio)
|
||||
{
|
||||
xpram_device_t *xdev = bio->bi_bdev->bd_disk->private_data;
|
||||
struct bio_vec bvec;
|
||||
|
|
@ -223,9 +223,10 @@ static void xpram_make_request(struct request_queue *q, struct bio *bio)
|
|||
}
|
||||
}
|
||||
bio_endio(bio);
|
||||
return;
|
||||
return BLK_QC_T_NONE;
|
||||
fail:
|
||||
bio_io_error(bio);
|
||||
return BLK_QC_T_NONE;
|
||||
}
|
||||
|
||||
static int xpram_getgeo(struct block_device *bdev, struct hd_geometry *geo)
|
||||
|
|
|
|||
Loading…
Reference in a new issue