Merge tag 'for-5.12/drivers-2021-02-17' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / drivers / block / drbd / drbd_main.c

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 1c8c18b..25cd8a2 100644 (file)
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -138,19 +138,6 @@ static const struct block_device_operations drbd_ops = {
        .release        = drbd_release,
 };
 
-struct bio *bio_alloc_drbd(gfp_t gfp_mask)
-{
-       struct bio *bio;
-
-       if (!bioset_initialized(&drbd_md_io_bio_set))
-               return bio_alloc(gfp_mask, 1);
-
-       bio = bio_alloc_bioset(gfp_mask, 1, &drbd_md_io_bio_set);
-       if (!bio)
-               return NULL;
-       return bio;
-}
-
 #ifdef __CHECKER__
 /* When checking with sparse, and this is an inline function, sparse will
    give tons of false positives. When this is a real functions sparse works.
@@ -2288,7 +2275,6 @@ static void do_retry(struct work_struct *ws)
        list_for_each_entry_safe(req, tmp, &writes, tl_requests) {
                struct drbd_device *device = req->device;
                struct bio *bio = req->master_bio;
-               unsigned long start_jif = req->start_jif;
                bool expected;
 
                expected =
@@ -2323,7 +2309,7 @@ static void do_retry(struct work_struct *ws)
                /* We are not just doing submit_bio_noacct(),
                 * as we want to keep the start_time information. */
                inc_ap_bio(device);
-               __drbd_make_request(device, bio, start_jif);
+               __drbd_make_request(device, bio);
        }
 }