diff options
author | Christoph Hellwig <hch@infradead.org> | 2011-09-12 06:12:01 -0400 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2011-09-12 06:12:01 -0400 |
commit | 5a7bbad27a410350e64a2d7f5ec18fc73836c14f (patch) | |
tree | 3447cd62dbcbd77b4071e2eb7576f1d7632ef2d3 /drivers/md/raid1.c | |
parent | c20e8de27fef9f59869c81c288ad6cf28200e00c (diff) |
block: remove support for bio remapping from ->make_request
There is very little benefit in allowing to let a ->make_request
instance update the bios device and sector and loop around it in
__generic_make_request when we can archive the same through calling
generic_make_request from the driver and letting the loop in
generic_make_request handle it.
Note that various drivers got the return value from ->make_request and
returned non-zero values for errors.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: NeilBrown <neilb@suse.de>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/md/raid1.c')
-rw-r--r-- | drivers/md/raid1.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 32323f0afd89..97f2a5f977b1 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c | |||
@@ -785,7 +785,7 @@ do_sync_io: | |||
785 | PRINTK("%dB behind alloc failed, doing sync I/O\n", bio->bi_size); | 785 | PRINTK("%dB behind alloc failed, doing sync I/O\n", bio->bi_size); |
786 | } | 786 | } |
787 | 787 | ||
788 | static int make_request(mddev_t *mddev, struct bio * bio) | 788 | static void make_request(mddev_t *mddev, struct bio * bio) |
789 | { | 789 | { |
790 | conf_t *conf = mddev->private; | 790 | conf_t *conf = mddev->private; |
791 | mirror_info_t *mirror; | 791 | mirror_info_t *mirror; |
@@ -870,7 +870,7 @@ read_again: | |||
870 | if (rdisk < 0) { | 870 | if (rdisk < 0) { |
871 | /* couldn't find anywhere to read from */ | 871 | /* couldn't find anywhere to read from */ |
872 | raid_end_bio_io(r1_bio); | 872 | raid_end_bio_io(r1_bio); |
873 | return 0; | 873 | return; |
874 | } | 874 | } |
875 | mirror = conf->mirrors + rdisk; | 875 | mirror = conf->mirrors + rdisk; |
876 | 876 | ||
@@ -928,7 +928,7 @@ read_again: | |||
928 | goto read_again; | 928 | goto read_again; |
929 | } else | 929 | } else |
930 | generic_make_request(read_bio); | 930 | generic_make_request(read_bio); |
931 | return 0; | 931 | return; |
932 | } | 932 | } |
933 | 933 | ||
934 | /* | 934 | /* |
@@ -1119,8 +1119,6 @@ read_again: | |||
1119 | 1119 | ||
1120 | if (do_sync || !bitmap || !plugged) | 1120 | if (do_sync || !bitmap || !plugged) |
1121 | md_wakeup_thread(mddev->thread); | 1121 | md_wakeup_thread(mddev->thread); |
1122 | |||
1123 | return 0; | ||
1124 | } | 1122 | } |
1125 | 1123 | ||
1126 | static void status(struct seq_file *seq, mddev_t *mddev) | 1124 | static void status(struct seq_file *seq, mddev_t *mddev) |