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

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

fs: have ll_rw_block users pass in op and flags separately 



This has ll_rw_block users pass in the operation and flags separately,
so ll_rw_block can setup the bio op and bi_rw flags on the bio that
is submitted.

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 2a222ca9

fs/buffer.c

+10 −9
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ void write_boundary_block(struct block_device *bdev, 
	struct buffer_head *bh = __find_get_block(bdev, bblock + 1, blocksize);

	if (bh) {

		if (buffer_dirty(bh))

			ll_rw_block(WRITE, 1, &bh);

			ll_rw_block(REQ_OP_WRITE, 0, 1, &bh);

		put_bh(bh);

	}

}
@@ -1395,7 +1395,7 @@ void __breadahead(struct block_device *bdev, sector_t block, unsigned size) 
{

	struct buffer_head *bh = __getblk(bdev, block, size);

	if (likely(bh)) {

		ll_rw_block(READA, 1, &bh);

		ll_rw_block(REQ_OP_READ, READA, 1, &bh);

		brelse(bh);

	}

}
@@ -1955,7 +1955,7 @@ int __block_write_begin(struct page *page, loff_t pos, unsigned len, 
		if (!buffer_uptodate(bh) && !buffer_delay(bh) &&

		    !buffer_unwritten(bh) &&

		     (block_start < from || block_end > to)) {

			ll_rw_block(READ, 1, &bh);

			ll_rw_block(REQ_OP_READ, 0, 1, &bh);

			*wait_bh++=bh;

		}

	}
@@ -2852,7 +2852,7 @@ int block_truncate_page(struct address_space *mapping, 


	if (!buffer_uptodate(bh) && !buffer_delay(bh) && !buffer_unwritten(bh)) {

		err = -EIO;

		ll_rw_block(READ, 1, &bh);

		ll_rw_block(REQ_OP_READ, 0, 1, &bh);

		wait_on_buffer(bh);

		/* Uhhuh. Read error. Complain and punt. */

		if (!buffer_uptodate(bh))
@@ -3051,7 +3051,8 @@ EXPORT_SYMBOL(submit_bh); 


/**

 * ll_rw_block: low-level access to block devices (DEPRECATED)

 * @rw: whether to %READ or %WRITE or maybe %READA (readahead)

 * @op: whether to %READ or %WRITE

 * @op_flags: rq_flag_bits or %READA (readahead)

 * @nr: number of &struct buffer_heads in the array

 * @bhs: array of pointers to &struct buffer_head

 *
@@ -3074,7 +3075,7 @@ EXPORT_SYMBOL(submit_bh); 
 * All of the buffers must be for the same device, and must also be a

 * multiple of the current approved size for the device.

 */

void ll_rw_block(int rw, int nr, struct buffer_head *bhs[])

void ll_rw_block(int op, int op_flags,  int nr, struct buffer_head *bhs[])

{

	int i;
@@ -3083,18 +3084,18 @@ void ll_rw_block(int rw, int nr, struct buffer_head *bhs[]) 


		if (!trylock_buffer(bh))

			continue;

		if (rw == WRITE) {

		if (op == WRITE) {

			if (test_clear_buffer_dirty(bh)) {

				bh->b_end_io = end_buffer_write_sync;

				get_bh(bh);

				submit_bh(rw, 0, bh);

				submit_bh(op, op_flags, bh);

				continue;

			}

		} else {

			if (!buffer_uptodate(bh)) {

				bh->b_end_io = end_buffer_read_sync;

				get_bh(bh);

				submit_bh(rw, 0, bh);

				submit_bh(op, op_flags, bh);

				continue;

			}

		}

fs/ext4/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -981,7 +981,7 @@ struct buffer_head *ext4_bread(handle_t *handle, struct inode *inode, 
		return bh;

	if (!bh || buffer_uptodate(bh))

		return bh;

	ll_rw_block(READ | REQ_META | REQ_PRIO, 1, &bh);

	ll_rw_block(REQ_OP_READ, REQ_META | REQ_PRIO, 1, &bh);

	wait_on_buffer(bh);

	if (buffer_uptodate(bh))

		return bh;
@@ -1135,7 +1135,7 @@ static int ext4_block_write_begin(struct page *page, loff_t pos, unsigned len, 
		if (!buffer_uptodate(bh) && !buffer_delay(bh) &&

		    !buffer_unwritten(bh) &&

		    (block_start < from || block_end > to)) {

			ll_rw_block(READ, 1, &bh);

			ll_rw_block(REQ_OP_READ, 0, 1, &bh);

			*wait_bh++ = bh;

			decrypt = ext4_encrypted_inode(inode) &&

				S_ISREG(inode->i_mode);
@@ -3698,7 +3698,7 @@ static int __ext4_block_zero_page_range(handle_t *handle, 


	if (!buffer_uptodate(bh)) {

		err = -EIO;

		ll_rw_block(READ, 1, &bh);

		ll_rw_block(REQ_OP_READ, 0, 1, &bh);

		wait_on_buffer(bh);

		/* Uhhuh. Read error. Complain and punt. */

		if (!buffer_uptodate(bh))

fs/ext4/namei.c

+2 −1
Original line number Diff line number Diff line
@@ -1443,7 +1443,8 @@ static struct buffer_head * ext4_find_entry (struct inode *dir, 
				}

				bh_use[ra_max] = bh;

				if (bh)

					ll_rw_block(READ | REQ_META | REQ_PRIO,

					ll_rw_block(REQ_OP_READ,

						    REQ_META | REQ_PRIO,

						    1, &bh);

			}

		}

fs/ext4/super.c

+1 −1
Original line number Diff line number Diff line
@@ -4204,7 +4204,7 @@ static journal_t *ext4_get_dev_journal(struct super_block *sb, 
		goto out_bdev;

	}

	journal->j_private = sb;

	ll_rw_block(READ | REQ_META | REQ_PRIO, 1, &journal->j_sb_buffer);

	ll_rw_block(REQ_OP_READ, REQ_META | REQ_PRIO, 1, &journal->j_sb_buffer);

	wait_on_buffer(journal->j_sb_buffer);

	if (!buffer_uptodate(journal->j_sb_buffer)) {

		ext4_msg(sb, KERN_ERR, "I/O error on journal device");

fs/gfs2/bmap.c

+1 −1
Original line number Diff line number Diff line
@@ -974,7 +974,7 @@ static int gfs2_block_truncate_page(struct address_space *mapping, loff_t from) 


	if (!buffer_uptodate(bh)) {

		err = -EIO;

		ll_rw_block(READ, 1, &bh);

		ll_rw_block(REQ_OP_READ, 0, 1, &bh);

		wait_on_buffer(bh);

		/* Uhhuh. Read error. Complain and punt. */

		if (!buffer_uptodate(bh))