summaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_main.c
diff options
context:
space:
mode:
authorLars Ellenberg2012-01-24 16:49:58 +0100
committerPhilipp Reisner2012-11-08 16:58:35 +0100
commit5df69ece6e93cfd4e09b14bf32bd101df6cbde38 (patch)
tree415a402956088609d20ba15f77015b9c8c073705 /drivers/block/drbd/drbd_main.c
parentdrbd: better separate WRITE and READ code paths in drbd_make_request (diff)
downloadkernel-qcow2-linux-5df69ece6e93cfd4e09b14bf32bd101df6cbde38.tar.gz
kernel-qcow2-linux-5df69ece6e93cfd4e09b14bf32bd101df6cbde38.tar.xz
kernel-qcow2-linux-5df69ece6e93cfd4e09b14bf32bd101df6cbde38.zip
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_main.c')
-rw-r--r--drivers/block/drbd/drbd_main.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 8c6c48e363cd..bedfeeccd513 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -2236,9 +2236,8 @@ static void do_retry(struct work_struct *ws)
/* We are not just doing generic_make_request(),
* as we want to keep the start_time information. */
- do {
- inc_ap_bio(mdev);
- } while(__drbd_make_request(mdev, bio, start_time));
+ inc_ap_bio(mdev);
+ __drbd_make_request(mdev, bio, start_time);
}
}