drbd: remove drbd_req_make_private_bio

Open code drbd_req_make_private_bio in the two callers to prepare
for further changes.  Also don't bother to initialize bi_next as the
bio code already does that that.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Acked-by: Damien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index ea0f31ab334361e654a61f9992ed7e76a955aebe..9dbb660a7d7c8eadafc435cf32970ce82cae03cb 100644 (file)
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -30,7 +30,10 @@ static struct drbd_request *drbd_req_new(struct drbd_device *device, struct bio
                return NULL;
        memset(req, 0, sizeof(*req));
 
-       drbd_req_make_private_bio(req, bio_src);
+       req->private_bio = bio_clone_fast(bio_src, GFP_NOIO, &drbd_io_bio_set);
+       req->private_bio->bi_private = req;
+       req->private_bio->bi_end_io = drbd_request_endio;
+
        req->rq_state = (bio_data_dir(bio_src) == WRITE ? RQ_WRITE : 0)
                      | (bio_op(bio_src) == REQ_OP_WRITE_SAME ? RQ_WSAME : 0)
                      | (bio_op(bio_src) == REQ_OP_WRITE_ZEROES ? RQ_ZEROES : 0)

diff --git a/drivers/block/drbd/drbd_req.h b/drivers/block/drbd/drbd_req.h
index 55bb0f8721faa3418fa3e41300c0f40033c2f1a6..511f39a08de4536642cf26acc4b1ad74b2f4652d 100644 (file)
--- a/drivers/block/drbd/drbd_req.h
+++ b/drivers/block/drbd/drbd_req.h
@@ -256,18 +256,6 @@ enum drbd_req_state_bits {
 #define MR_WRITE       1
 #define MR_READ        2
 
-static inline void drbd_req_make_private_bio(struct drbd_request *req, struct bio *bio_src)
-{
-       struct bio *bio;
-       bio = bio_clone_fast(bio_src, GFP_NOIO, &drbd_io_bio_set);
-
-       req->private_bio = bio;
-
-       bio->bi_private  = req;
-       bio->bi_end_io   = drbd_request_endio;
-       bio->bi_next     = NULL;
-}
-
 /* Short lived temporary struct on the stack.
  * We could squirrel the error to be returned into
  * bio->bi_iter.bi_size, or similar. But that would be too ugly. */

diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index 02044ab7f767d593bfe063e6eaded77ce6c420d3..64563bfdf0da02b1c2eb3b709d59ac3157e599da 100644 (file)
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
@@ -1523,8 +1523,11 @@ int w_restart_disk_io(struct drbd_work *w, int cancel)
        if (bio_data_dir(req->master_bio) == WRITE && req->rq_state & RQ_IN_ACT_LOG)
                drbd_al_begin_io(device, &req->i);
 
-       drbd_req_make_private_bio(req, req->master_bio);
+       req->private_bio = bio_clone_fast(req->master_bio, GFP_NOIO,
+                                         &drbd_io_bio_set);
        bio_set_dev(req->private_bio, device->ldev->backing_bdev);
+       req->private_bio->bi_private = req;
+       req->private_bio->bi_end_io = drbd_request_endio;
        submit_bio_noacct(req->private_bio);
 
        return 0;