diff options
Diffstat (limited to 'drivers/md/bcache/request.c')
-rw-r--r-- | drivers/md/bcache/request.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c index 8e9877b04637..25fa8445bb24 100644 --- a/drivers/md/bcache/request.c +++ b/drivers/md/bcache/request.c | |||
@@ -958,7 +958,8 @@ static void cached_dev_nodata(struct closure *cl) | |||
958 | 958 | ||
959 | /* Cached devices - read & write stuff */ | 959 | /* Cached devices - read & write stuff */ |
960 | 960 | ||
961 | static void cached_dev_make_request(struct request_queue *q, struct bio *bio) | 961 | static blk_qc_t cached_dev_make_request(struct request_queue *q, |
962 | struct bio *bio) | ||
962 | { | 963 | { |
963 | struct search *s; | 964 | struct search *s; |
964 | struct bcache_device *d = bio->bi_bdev->bd_disk->private_data; | 965 | struct bcache_device *d = bio->bi_bdev->bd_disk->private_data; |
@@ -997,6 +998,8 @@ static void cached_dev_make_request(struct request_queue *q, struct bio *bio) | |||
997 | else | 998 | else |
998 | generic_make_request(bio); | 999 | generic_make_request(bio); |
999 | } | 1000 | } |
1001 | |||
1002 | return BLK_QC_T_NONE; | ||
1000 | } | 1003 | } |
1001 | 1004 | ||
1002 | static int cached_dev_ioctl(struct bcache_device *d, fmode_t mode, | 1005 | static int cached_dev_ioctl(struct bcache_device *d, fmode_t mode, |
@@ -1070,7 +1073,8 @@ static void flash_dev_nodata(struct closure *cl) | |||
1070 | continue_at(cl, search_free, NULL); | 1073 | continue_at(cl, search_free, NULL); |
1071 | } | 1074 | } |
1072 | 1075 | ||
1073 | static void flash_dev_make_request(struct request_queue *q, struct bio *bio) | 1076 | static blk_qc_t flash_dev_make_request(struct request_queue *q, |
1077 | struct bio *bio) | ||
1074 | { | 1078 | { |
1075 | struct search *s; | 1079 | struct search *s; |
1076 | struct closure *cl; | 1080 | struct closure *cl; |
@@ -1093,7 +1097,7 @@ static void flash_dev_make_request(struct request_queue *q, struct bio *bio) | |||
1093 | continue_at_nobarrier(&s->cl, | 1097 | continue_at_nobarrier(&s->cl, |
1094 | flash_dev_nodata, | 1098 | flash_dev_nodata, |
1095 | bcache_wq); | 1099 | bcache_wq); |
1096 | return; | 1100 | return BLK_QC_T_NONE; |
1097 | } else if (rw) { | 1101 | } else if (rw) { |
1098 | bch_keybuf_check_overlapping(&s->iop.c->moving_gc_keys, | 1102 | bch_keybuf_check_overlapping(&s->iop.c->moving_gc_keys, |
1099 | &KEY(d->id, bio->bi_iter.bi_sector, 0), | 1103 | &KEY(d->id, bio->bi_iter.bi_sector, 0), |
@@ -1109,6 +1113,7 @@ static void flash_dev_make_request(struct request_queue *q, struct bio *bio) | |||
1109 | } | 1113 | } |
1110 | 1114 | ||
1111 | continue_at(cl, search_free, NULL); | 1115 | continue_at(cl, search_free, NULL); |
1116 | return BLK_QC_T_NONE; | ||
1112 | } | 1117 | } |
1113 | 1118 | ||
1114 | static int flash_dev_ioctl(struct bcache_device *d, fmode_t mode, | 1119 | static int flash_dev_ioctl(struct bcache_device *d, fmode_t mode, |