aboutsummaryrefslogtreecommitdiff
path: root/drivers/block/drbd/drbd_req.c
diff options
context:
space:
mode:
authorLars Ellenberg <lars.ellenberg@linbit.com>2012-01-24 16:49:58 +0100
committerPhilipp Reisner <philipp.reisner@linbit.com>2012-11-08 16:58:35 +0100
commit5df69ece6e93cfd4e09b14bf32bd101df6cbde38 (patch)
tree415a402956088609d20ba15f77015b9c8c073705 /drivers/block/drbd/drbd_req.c
parent5da9c8364443797ece9393670fb7ab69cff055ed (diff)
downloadvexpress-lsk-5df69ece6e93cfd4e09b14bf32bd101df6cbde38.tar.gz
drbd: __drbd_make_request() is now void
The previous commit causes __drbd_make_request() to always return 0. Change it to void. Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_req.c')
-rw-r--r--drivers/block/drbd/drbd_req.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index d2d61af034e..6bac415358d 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -945,7 +945,7 @@ drbd_submit_req_private_bio(struct drbd_request *req)
bio_endio(bio, -EIO);
}
-int __drbd_make_request(struct drbd_conf *mdev, struct bio *bio, unsigned long start_time)
+void __drbd_make_request(struct drbd_conf *mdev, struct bio *bio, unsigned long start_time)
{
const int rw = bio_rw(bio);
struct bio_and_error m = { NULL, };
@@ -960,7 +960,7 @@ int __drbd_make_request(struct drbd_conf *mdev, struct bio *bio, unsigned long s
* if user cannot handle io errors, that's not our business. */
dev_err(DEV, "could not kmalloc() req\n");
bio_endio(bio, -ENOMEM);
- return 0;
+ return;
}
req->start_time = start_time;
@@ -1039,7 +1039,7 @@ int __drbd_make_request(struct drbd_conf *mdev, struct bio *bio, unsigned long s
drbd_submit_req_private_bio(req);
/* once we have submitted, we must no longer look at req,
* it may already be destroyed. */
- return 0;
+ return;
} else if (no_remote) {
nodata:
if (__ratelimit(&drbd_ratelimit_state))
@@ -1054,7 +1054,7 @@ out:
if (m.bio)
complete_master_bio(mdev, &m);
- return 0;
+ return;
}
int drbd_make_request(struct request_queue *q, struct bio *bio)
@@ -1070,9 +1070,8 @@ int drbd_make_request(struct request_queue *q, struct bio *bio)
D_ASSERT(bio->bi_size > 0);
D_ASSERT(IS_ALIGNED(bio->bi_size, 512));
- do {
- inc_ap_bio(mdev);
- } while (__drbd_make_request(mdev, bio, start_time));
+ inc_ap_bio(mdev);
+ __drbd_make_request(mdev, bio, start_time);
return 0;
}