[RFC PATCH 07/34] dm: use bio_new in dm-log-writes

[Chaitanya Kulkarni <chaitanya.kulkarni@xxxxxxx>]

Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@xxxxxxx>
---
 drivers/md/dm-log-writes.c | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/drivers/md/dm-log-writes.c b/drivers/md/dm-log-writes.c
index e3d35c6c9f71..7ca9af407647 100644
--- a/drivers/md/dm-log-writes.c
+++ b/drivers/md/dm-log-writes.c
@@ -217,18 +217,15 @@ static int write_metadata(struct log_writes_c *lc, void 
*entry,
        void *ptr;
        size_t ret;
 
-       bio = bio_alloc(GFP_KERNEL, 1);
+       bio = bio_new(lc->logdev->bdev, sector, REQ_OP_WRITE, 0, 1, GFP_KERNEL);
        if (!bio) {
                DMERR("Couldn't alloc log bio");
                goto error;
        }
        bio->bi_iter.bi_size = 0;
-       bio->bi_iter.bi_sector = sector;
-       bio_set_dev(bio, lc->logdev->bdev);
        bio->bi_end_io = (sector == WRITE_LOG_SUPER_SECTOR) ?
                          log_end_super : log_end_io;
        bio->bi_private = lc;
-       bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
 
        page = alloc_page(GFP_KERNEL);
        if (!page) {
@@ -264,7 +261,7 @@ static int write_inline_data(struct log_writes_c *lc, void 
*entry,
                             size_t entrylen, void *data, size_t datalen,
                             sector_t sector)
 {
-       int num_pages, bio_pages, pg_datalen, pg_sectorlen, i;
+       int num_pages, pg_datalen, pg_sectorlen, i;
        struct page *page;
        struct bio *bio;
        size_t ret;
@@ -272,24 +269,21 @@ static int write_inline_data(struct log_writes_c *lc, 
void *entry,
 
        while (datalen) {
                num_pages = ALIGN(datalen, PAGE_SIZE) >> PAGE_SHIFT;
-               bio_pages = min(num_pages, BIO_MAX_PAGES);
 
                atomic_inc(&lc->io_blocks);
 
-               bio = bio_alloc(GFP_KERNEL, bio_pages);
+               bio = bio_new(lc->logdev->bdev, sector, REQ_OP_WRITE, 0,
+                             num_pages, GFP_KERNEL);
                if (!bio) {
                        DMERR("Couldn't alloc inline data bio");
                        goto error;
                }
 
                bio->bi_iter.bi_size = 0;
-               bio->bi_iter.bi_sector = sector;
-               bio_set_dev(bio, lc->logdev->bdev);
                bio->bi_end_io = log_end_io;
                bio->bi_private = lc;
-               bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
 
-               for (i = 0; i < bio_pages; i++) {
+               for (i = 0; i < bio->bi_max_vecs; i++) {
                        pg_datalen = min_t(int, datalen, PAGE_SIZE);
                        pg_sectorlen = ALIGN(pg_datalen, lc->sectorsize);
 
@@ -317,7 +311,7 @@ static int write_inline_data(struct log_writes_c *lc, void 
*entry,
                }
                submit_bio(bio);
 
-               sector += bio_pages * PAGE_SECTORS;
+               sector += bio->bi_max_vecs * PAGE_SECTORS;
        }
        return 0;
 error_bio:
@@ -364,17 +358,15 @@ static int log_one_block(struct log_writes_c *lc,
                goto out;
 
        atomic_inc(&lc->io_blocks);
-       bio = bio_alloc(GFP_KERNEL, min(block->vec_cnt, BIO_MAX_PAGES));
+       bio = bio_new(lc->logdev->bdev, sector, REQ_OP_WRITE, 0,
+                       block->vec_cnt, GFP_KERNEL);
        if (!bio) {
                DMERR("Couldn't alloc log bio");
                goto error;
        }
        bio->bi_iter.bi_size = 0;
-       bio->bi_iter.bi_sector = sector;
-       bio_set_dev(bio, lc->logdev->bdev);
        bio->bi_end_io = log_end_io;
        bio->bi_private = lc;
-       bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
 
        for (i = 0; i < block->vec_cnt; i++) {
                /*
@@ -386,17 +378,15 @@ static int log_one_block(struct log_writes_c *lc,
                if (ret != block->vecs[i].bv_len) {
                        atomic_inc(&lc->io_blocks);
                        submit_bio(bio);
-                       bio = bio_alloc(GFP_KERNEL, min(block->vec_cnt - i, 
BIO_MAX_PAGES));
+                       bio = bio_new(lc->logdev->bdev, sector, REQ_OP_WRITE,
+                                       0, block->vec_cnt - i, GFP_KERNEL);
                        if (!bio) {
                                DMERR("Couldn't alloc log bio");
                                goto error;
                        }
                        bio->bi_iter.bi_size = 0;
-                       bio->bi_iter.bi_sector = sector;
-                       bio_set_dev(bio, lc->logdev->bdev);
                        bio->bi_end_io = log_end_io;
                        bio->bi_private = lc;
-                       bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
 
                        ret = bio_add_page(bio, block->vecs[i].bv_page,
                                           block->vecs[i].bv_len, 0);
-- 
2.22.1