lkml.org 
[lkml]   [2016]   [Apr]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 17/42] ocfs2: set bi_op to REQ_OP
    Date
    From: Mike Christie <mchristi@redhat.com>

    This patch has ocfs2 use bio->bi_op for REQ_OPs and rq_flag_bits
    to bio->bi_rw.

    Signed-off-by: Mike Christie <mchristi@redhat.com>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Reviewed-by: Hannes Reinecke <hare@suse.com>
    ---
    fs/ocfs2/cluster/heartbeat.c | 11 +++++++----
    1 file changed, 7 insertions(+), 4 deletions(-)

    diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
    index e37373d..0619a20 100644
    --- a/fs/ocfs2/cluster/heartbeat.c
    +++ b/fs/ocfs2/cluster/heartbeat.c
    @@ -530,7 +530,8 @@ static void o2hb_bio_end_io(struct bio *bio)
    static struct bio *o2hb_setup_one_bio(struct o2hb_region *reg,
    struct o2hb_bio_wait_ctxt *wc,
    unsigned int *current_slot,
    - unsigned int max_slots, int rw)
    + unsigned int max_slots, int op,
    + int op_flags)
    {
    int len, current_page;
    unsigned int vec_len, vec_start;
    @@ -556,7 +557,8 @@ static struct bio *o2hb_setup_one_bio(struct o2hb_region *reg,
    bio->bi_bdev = reg->hr_bdev;
    bio->bi_private = wc;
    bio->bi_end_io = o2hb_bio_end_io;
    - bio->bi_rw = rw;
    + bio->bi_op = op;
    + bio->bi_rw = op_flags;

    vec_start = (cs << bits) % PAGE_SIZE;
    while(cs < max_slots) {
    @@ -593,7 +595,7 @@ static int o2hb_read_slots(struct o2hb_region *reg,

    while(current_slot < max_slots) {
    bio = o2hb_setup_one_bio(reg, &wc, &current_slot, max_slots,
    - READ);
    + REQ_OP_READ, 0);
    if (IS_ERR(bio)) {
    status = PTR_ERR(bio);
    mlog_errno(status);
    @@ -625,7 +627,8 @@ static int o2hb_issue_node_write(struct o2hb_region *reg,

    slot = o2nm_this_node();

    - bio = o2hb_setup_one_bio(reg, write_wc, &slot, slot+1, WRITE_SYNC);
    + bio = o2hb_setup_one_bio(reg, write_wc, &slot, slot+1, REQ_OP_WRITE,
    + WRITE_SYNC);
    if (IS_ERR(bio)) {
    status = PTR_ERR(bio);
    mlog_errno(status);
    --
    2.7.2
    \
     
     \ /
      Last update: 2016-04-15 13:41    [W:4.082 / U:0.372 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site