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

xfs: use bio op accessors 



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

Signed-off-by: default avatarMike Christie <mchristi@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent e1b1afa6

fs/xfs/xfs_aops.c

+4 −8
Original line number Original line Diff line number Diff line
@@ -438,10 +438,8 @@ xfs_submit_ioend( 




	ioend->io_bio->bi_private = ioend;

	ioend->io_bio->bi_private = ioend;

	ioend->io_bio->bi_end_io = xfs_end_bio;

	ioend->io_bio->bi_end_io = xfs_end_bio;

	if (wbc->sync_mode == WB_SYNC_ALL)

	bio_set_op_attrs(ioend->io_bio, REQ_OP_WRITE,

		ioend->io_bio->bi_rw = WRITE_SYNC;

			 (wbc->sync_mode == WB_SYNC_ALL) ? WRITE_SYNC : 0);

	else

		ioend->io_bio->bi_rw = WRITE;

	/*

	/*

	 * If we are failing the IO now, just mark the ioend with an

	 * If we are failing the IO now, just mark the ioend with an

	 * error and finish it. This will run IO completion immediately

	 * error and finish it. This will run IO completion immediately
@@ -512,10 +510,8 @@ xfs_chain_bio( 




	bio_chain(ioend->io_bio, new);

	bio_chain(ioend->io_bio, new);

	bio_get(ioend->io_bio);		/* for xfs_destroy_ioend */

	bio_get(ioend->io_bio);		/* for xfs_destroy_ioend */

	if (wbc->sync_mode == WB_SYNC_ALL)

	bio_set_op_attrs(ioend->io_bio, REQ_OP_WRITE,

		ioend->io_bio->bi_rw = WRITE_SYNC;

			  (wbc->sync_mode == WB_SYNC_ALL) ? WRITE_SYNC : 0);

	else

		ioend->io_bio->bi_rw = WRITE;

	submit_bio(ioend->io_bio);

	submit_bio(ioend->io_bio);

	ioend->io_bio = new;

	ioend->io_bio = new;

}

}

fs/xfs/xfs_buf.c

+14 −12
Original line number Original line Diff line number Diff line
@@ -1127,7 +1127,8 @@ xfs_buf_ioapply_map( 
	int		map,

	int		map,

	int		*buf_offset,

	int		*buf_offset,

	int		*count,

	int		*count,

	int		rw)

	int		op,

	int		op_flags)

{

{

	int		page_index;

	int		page_index;

	int		total_nr_pages = bp->b_page_count;

	int		total_nr_pages = bp->b_page_count;
@@ -1166,7 +1167,7 @@ xfs_buf_ioapply_map( 
	bio->bi_iter.bi_sector = sector;

	bio->bi_iter.bi_sector = sector;

	bio->bi_end_io = xfs_buf_bio_end_io;

	bio->bi_end_io = xfs_buf_bio_end_io;

	bio->bi_private = bp;

	bio->bi_private = bp;

	bio->bi_rw = rw;

	bio_set_op_attrs(bio, op, op_flags);





	for (; size && nr_pages; nr_pages--, page_index++) {

	for (; size && nr_pages; nr_pages--, page_index++) {

		int	rbytes, nbytes = PAGE_SIZE - offset;

		int	rbytes, nbytes = PAGE_SIZE - offset;
@@ -1210,7 +1211,8 @@ _xfs_buf_ioapply( 
	struct xfs_buf	*bp)

	struct xfs_buf	*bp)

{

{

	struct blk_plug	plug;

	struct blk_plug	plug;

	int		rw;

	int		op;

	int		op_flags = 0;

	int		offset;

	int		offset;

	int		size;

	int		size;

	int		i;

	int		i;
@@ -1229,14 +1231,13 @@ _xfs_buf_ioapply( 
		bp->b_ioend_wq = bp->b_target->bt_mount->m_buf_workqueue;

		bp->b_ioend_wq = bp->b_target->bt_mount->m_buf_workqueue;





	if (bp->b_flags & XBF_WRITE) {

	if (bp->b_flags & XBF_WRITE) {

		op = REQ_OP_WRITE;

		if (bp->b_flags & XBF_SYNCIO)

		if (bp->b_flags & XBF_SYNCIO)

			rw = WRITE_SYNC;

			op_flags = WRITE_SYNC;

		else

			rw = WRITE;

		if (bp->b_flags & XBF_FUA)

		if (bp->b_flags & XBF_FUA)

			rw |= REQ_FUA;

			op_flags |= REQ_FUA;

		if (bp->b_flags & XBF_FLUSH)

		if (bp->b_flags & XBF_FLUSH)

			rw |= REQ_FLUSH;

			op_flags |= REQ_FLUSH;





		/*

		/*

		 * Run the write verifier callback function if it exists. If

		 * Run the write verifier callback function if it exists. If
@@ -1266,13 +1267,14 @@ _xfs_buf_ioapply( 
			}

			}

		}

		}

	} else if (bp->b_flags & XBF_READ_AHEAD) {

	} else if (bp->b_flags & XBF_READ_AHEAD) {

		rw = READA;

		op = REQ_OP_READ;

		op_flags = REQ_RAHEAD;

	} else {

	} else {

		rw = READ;

		op = REQ_OP_READ;

	}

	}





	/* we only use the buffer cache for meta-data */

	/* we only use the buffer cache for meta-data */

	rw |= REQ_META;

	op_flags |= REQ_META;





	/*

	/*

	 * Walk all the vectors issuing IO on them. Set up the initial offset

	 * Walk all the vectors issuing IO on them. Set up the initial offset
@@ -1284,7 +1286,7 @@ _xfs_buf_ioapply( 
	size = BBTOB(bp->b_io_length);

	size = BBTOB(bp->b_io_length);

	blk_start_plug(&plug);

	blk_start_plug(&plug);

	for (i = 0; i < bp->b_map_count; i++) {

	for (i = 0; i < bp->b_map_count; i++) {

		xfs_buf_ioapply_map(bp, i, &offset, &size, rw);

		xfs_buf_ioapply_map(bp, i, &offset, &size, op, op_flags);

		if (bp->b_error)

		if (bp->b_error)

			break;

			break;

		if (size <= 0)

		if (size <= 0)