Merge branch 'drbd-8.4_ed6' into for-3.8-drivers-drbd-8.4_ed6

[firefly-linux-kernel-4.4.55.git] / drivers / block / drbd / drbd_req.c

diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index b905a0453bf958df6ed539d63433d7427971c4cd..f58a4a4b4dfb3d1042113bbcbf34ee7c8280b7e8 100644 (file)
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -1140,7 +1140,7 @@ out:
        return;
 }
 
-int drbd_make_request(struct request_queue *q, struct bio *bio)
+void drbd_make_request(struct request_queue *q, struct bio *bio)
 {
        struct drbd_conf *mdev = (struct drbd_conf *) q->queuedata;
        unsigned long start_time;
@@ -1154,8 +1154,6 @@ int drbd_make_request(struct request_queue *q, struct bio *bio)
 
        inc_ap_bio(mdev);
        __drbd_make_request(mdev, bio, start_time);
-
-       return 0;
 }
 
 /* This is called by bio_add_page().