lkml.org 
[lkml]   [2021]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC PATCH 25/34] ocfs/cluster: use bio_new in dm-log-writes
    Date
    Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
    ---
    fs/ocfs2/cluster/heartbeat.c | 6 ++----
    1 file changed, 2 insertions(+), 4 deletions(-)

    diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
    index 0179a73a3fa2..b34518036446 100644
    --- a/fs/ocfs2/cluster/heartbeat.c
    +++ b/fs/ocfs2/cluster/heartbeat.c
    @@ -515,12 +515,13 @@ static struct bio *o2hb_setup_one_bio(struct o2hb_region *reg,
    unsigned int cs = *current_slot;
    struct bio *bio;
    struct page *page;
    + sector_t sect = (reg->hr_start_block + cs) << (bits - 9);

    /* Testing has shown this allocation to take long enough under
    * GFP_KERNEL that the local node can get fenced. It would be
    * nicest if we could pre-allocate these bios and avoid this
    * all together. */
    - bio = bio_alloc(GFP_ATOMIC, 16);
    + bio = bio_new(reg->hr_bdev, sect, op, op_flags, 16, GFP_ATOMIC);
    if (!bio) {
    mlog(ML_ERROR, "Could not alloc slots BIO!\n");
    bio = ERR_PTR(-ENOMEM);
    @@ -528,11 +529,8 @@ static struct bio *o2hb_setup_one_bio(struct o2hb_region *reg,
    }

    /* Must put everything in 512 byte sectors for the bio... */
    - bio->bi_iter.bi_sector = (reg->hr_start_block + cs) << (bits - 9);
    - bio_set_dev(bio, reg->hr_bdev);
    bio->bi_private = wc;
    bio->bi_end_io = o2hb_bio_end_io;
    - bio_set_op_attrs(bio, op, op_flags);

    vec_start = (cs << bits) % PAGE_SIZE;
    while(cs < max_slots) {
    --
    2.22.1
    \
     
     \ /
      Last update: 2021-01-28 08:21    [W:7.091 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site