Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d16dcfe authored by Mike Christie's avatar Mike Christie Committed by Jens Axboe
Browse files

ocfs2: use bio op accessors 



Separate the op from the rq_flag_bits and have ocfs2
set/get the bio using bio_set_op_attrs/bio_op.

Signed-off-by: default avatarMike Christie <mchristi@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent b2d45866

fs/ocfs2/cluster/heartbeat.c

+6 −4
Original line number Diff line number Diff line
@@ -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,7 @@ 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_set_op_attrs(bio, op, op_flags);



	vec_start = (cs << bits) % PAGE_SIZE;

	while(cs < max_slots) {
@@ -593,7 +594,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 +626,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);