aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/bcache/request.c
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2013-11-24 02:11:25 -0500
committerJens Axboe <axboe@fb.com>2015-08-13 14:31:40 -0400
commit749b61dab30736eb95b1ee23738cae90973d4fc3 (patch)
treea4523ba849c4d173d71cb4e97f4363f1a11b460d /drivers/md/bcache/request.c
parentc66a14d07c136cc35d4dcb84bfc7bc188be24d4c (diff)
bcache: remove driver private bio splitting code
The bcache driver has always accepted arbitrarily large bios and split them internally. Now that every driver must accept arbitrarily large bios this code isn't nessecary anymore. Cc: linux-bcache@vger.kernel.org Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com> [dpark: add more description in commit message] Signed-off-by: Dongsu Park <dpark@posteo.net> Signed-off-by: Ming Lin <ming.l@ssi.samsung.com> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/md/bcache/request.c')
-rw-r--r--drivers/md/bcache/request.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c
index a09b9462ff49..8e9877b04637 100644
--- a/drivers/md/bcache/request.c
+++ b/drivers/md/bcache/request.c
@@ -719,7 +719,7 @@ static void cached_dev_read_error(struct closure *cl)
719 719
720 /* XXX: invalidate cache */ 720 /* XXX: invalidate cache */
721 721
722 closure_bio_submit(bio, cl, s->d); 722 closure_bio_submit(bio, cl);
723 } 723 }
724 724
725 continue_at(cl, cached_dev_cache_miss_done, NULL); 725 continue_at(cl, cached_dev_cache_miss_done, NULL);
@@ -842,7 +842,7 @@ static int cached_dev_cache_miss(struct btree *b, struct search *s,
842 s->cache_miss = miss; 842 s->cache_miss = miss;
843 s->iop.bio = cache_bio; 843 s->iop.bio = cache_bio;
844 bio_get(cache_bio); 844 bio_get(cache_bio);
845 closure_bio_submit(cache_bio, &s->cl, s->d); 845 closure_bio_submit(cache_bio, &s->cl);
846 846
847 return ret; 847 return ret;
848out_put: 848out_put:
@@ -850,7 +850,7 @@ out_put:
850out_submit: 850out_submit:
851 miss->bi_end_io = request_endio; 851 miss->bi_end_io = request_endio;
852 miss->bi_private = &s->cl; 852 miss->bi_private = &s->cl;
853 closure_bio_submit(miss, &s->cl, s->d); 853 closure_bio_submit(miss, &s->cl);
854 return ret; 854 return ret;
855} 855}
856 856
@@ -915,7 +915,7 @@ static void cached_dev_write(struct cached_dev *dc, struct search *s)
915 915
916 if (!(bio->bi_rw & REQ_DISCARD) || 916 if (!(bio->bi_rw & REQ_DISCARD) ||
917 blk_queue_discard(bdev_get_queue(dc->bdev))) 917 blk_queue_discard(bdev_get_queue(dc->bdev)))
918 closure_bio_submit(bio, cl, s->d); 918 closure_bio_submit(bio, cl);
919 } else if (s->iop.writeback) { 919 } else if (s->iop.writeback) {
920 bch_writeback_add(dc); 920 bch_writeback_add(dc);
921 s->iop.bio = bio; 921 s->iop.bio = bio;
@@ -930,12 +930,12 @@ static void cached_dev_write(struct cached_dev *dc, struct search *s)
930 flush->bi_end_io = request_endio; 930 flush->bi_end_io = request_endio;
931 flush->bi_private = cl; 931 flush->bi_private = cl;
932 932
933 closure_bio_submit(flush, cl, s->d); 933 closure_bio_submit(flush, cl);
934 } 934 }
935 } else { 935 } else {
936 s->iop.bio = bio_clone_fast(bio, GFP_NOIO, dc->disk.bio_split); 936 s->iop.bio = bio_clone_fast(bio, GFP_NOIO, dc->disk.bio_split);
937 937
938 closure_bio_submit(bio, cl, s->d); 938 closure_bio_submit(bio, cl);
939 } 939 }
940 940
941 closure_call(&s->iop.cl, bch_data_insert, NULL, cl); 941 closure_call(&s->iop.cl, bch_data_insert, NULL, cl);
@@ -951,7 +951,7 @@ static void cached_dev_nodata(struct closure *cl)
951 bch_journal_meta(s->iop.c, cl); 951 bch_journal_meta(s->iop.c, cl);
952 952
953 /* If it's a flush, we send the flush to the backing device too */ 953 /* If it's a flush, we send the flush to the backing device too */
954 closure_bio_submit(bio, cl, s->d); 954 closure_bio_submit(bio, cl);
955 955
956 continue_at(cl, cached_dev_bio_complete, NULL); 956 continue_at(cl, cached_dev_bio_complete, NULL);
957} 957}
@@ -995,7 +995,7 @@ static void cached_dev_make_request(struct request_queue *q, struct bio *bio)
995 !blk_queue_discard(bdev_get_queue(dc->bdev))) 995 !blk_queue_discard(bdev_get_queue(dc->bdev)))
996 bio_endio(bio); 996 bio_endio(bio);
997 else 997 else
998 bch_generic_make_request(bio, &d->bio_split_hook); 998 generic_make_request(bio);
999 } 999 }
1000} 1000}
1001 1001