[RFC PATCH 14/34] fs/buffer: use bio_new in submit_bh_wbc

[Chaitanya Kulkarni <chaitanya.kulkarni@xxxxxxx>]

Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@xxxxxxx>
---
 fs/buffer.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/fs/buffer.c b/fs/buffer.c
index 32647d2011df..fcbea667fa04 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -3023,12 +3023,16 @@ static int submit_bh_wbc(int op, int op_flags, struct 
buffer_head *bh,
        if (test_set_buffer_req(bh) && (op == REQ_OP_WRITE))
                clear_buffer_write_io_error(bh);
 
-       bio = bio_alloc(GFP_NOIO, 1);
+       if (buffer_meta(bh))
+               op_flags |= REQ_META;
+       if (buffer_prio(bh))
+               op_flags |= REQ_PRIO;
+
+       bio = bio_new(bh->b_bdev,  bh->b_blocknr * (bh->b_size >> 9), op,
+                     op_flags, GFP_NOIO, 1);
 
        fscrypt_set_bio_crypt_ctx_bh(bio, bh, GFP_NOIO);
 
-       bio->bi_iter.bi_sector = bh->b_blocknr * (bh->b_size >> 9);
-       bio_set_dev(bio, bh->b_bdev);
        bio->bi_write_hint = write_hint;
 
        bio_add_page(bio, bh->b_page, bh->b_size, bh_offset(bh));
@@ -3037,12 +3041,6 @@ static int submit_bh_wbc(int op, int op_flags, struct 
buffer_head *bh,
        bio->bi_end_io = end_bio_bh_io_sync;
        bio->bi_private = bh;
 
-       if (buffer_meta(bh))
-               op_flags |= REQ_META;
-       if (buffer_prio(bh))
-               op_flags |= REQ_PRIO;
-       bio_set_op_attrs(bio, op, op_flags);
-
        /* Take care of bh's that straddle the end of the device */
        guard_bio_eod(bio);
 
-- 
2.22.1