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

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

nilfs: use bio op accessors 



Separate the op from the rq_flag_bits and have nilfs
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>
Acked-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent eed25cd5

fs/nilfs2/segbuf.c

+9 −8
Original line number Diff line number Diff line
@@ -346,7 +346,8 @@ static void nilfs_end_bio_write(struct bio *bio) 
}



static int nilfs_segbuf_submit_bio(struct nilfs_segment_buffer *segbuf,

				   struct nilfs_write_info *wi, int mode)

				   struct nilfs_write_info *wi, int mode,

				   int mode_flags)

{

	struct bio *bio = wi->bio;

	int err;
@@ -364,7 +365,7 @@ static int nilfs_segbuf_submit_bio(struct nilfs_segment_buffer *segbuf, 


	bio->bi_end_io = nilfs_end_bio_write;

	bio->bi_private = segbuf;

	bio->bi_rw = mode;

	bio_set_op_attrs(bio, mode, mode_flags);

	submit_bio(bio);

	segbuf->sb_nbio++;
@@ -438,7 +439,7 @@ static int nilfs_segbuf_submit_bh(struct nilfs_segment_buffer *segbuf, 
		return 0;

	}

	/* bio is FULL */

	err = nilfs_segbuf_submit_bio(segbuf, wi, mode);

	err = nilfs_segbuf_submit_bio(segbuf, wi, mode, 0);

	/* never submit current bh */

	if (likely(!err))

		goto repeat;
@@ -462,19 +463,19 @@ static int nilfs_segbuf_write(struct nilfs_segment_buffer *segbuf, 
{

	struct nilfs_write_info wi;

	struct buffer_head *bh;

	int res = 0, rw = WRITE;

	int res = 0;



	wi.nilfs = nilfs;

	nilfs_segbuf_prepare_write(segbuf, &wi);



	list_for_each_entry(bh, &segbuf->sb_segsum_buffers, b_assoc_buffers) {

		res = nilfs_segbuf_submit_bh(segbuf, &wi, bh, rw);

		res = nilfs_segbuf_submit_bh(segbuf, &wi, bh, REQ_OP_WRITE);

		if (unlikely(res))

			goto failed_bio;

	}



	list_for_each_entry(bh, &segbuf->sb_payload_buffers, b_assoc_buffers) {

		res = nilfs_segbuf_submit_bh(segbuf, &wi, bh, rw);

		res = nilfs_segbuf_submit_bh(segbuf, &wi, bh, REQ_OP_WRITE);

		if (unlikely(res))

			goto failed_bio;

	}
@@ -484,8 +485,8 @@ static int nilfs_segbuf_write(struct nilfs_segment_buffer *segbuf, 
		 * Last BIO is always sent through the following

		 * submission.

		 */

		rw |= REQ_SYNC;

		res = nilfs_segbuf_submit_bio(segbuf, &wi, rw);

		res = nilfs_segbuf_submit_bio(segbuf, &wi, REQ_OP_WRITE,

					      REQ_SYNC);

	}



 failed_bio: