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

Commit 5dc06c5a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: remove READ_META and WRITE_META 



Replace all occurnanced of the undocumented READ_META with READ | REQ_META
and remove the unused WRITE_META define.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent fcb8ce5c

fs/ext3/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -1134,7 +1134,7 @@ struct buffer_head *ext3_bread(handle_t *handle, struct inode *inode, 
		return bh;

	if (buffer_uptodate(bh))

		return bh;

	ll_rw_block(READ_META, 1, &bh);

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

	wait_on_buffer(bh);

	if (buffer_uptodate(bh))

		return bh;
@@ -2807,7 +2807,7 @@ static int __ext3_get_inode_loc(struct inode *inode, 
		trace_ext3_load_inode(inode);

		get_bh(bh);

		bh->b_end_io = end_buffer_read_sync;

		submit_bh(READ_META, bh);

		submit_bh(READ | REQ_META, bh);

		wait_on_buffer(bh);

		if (!buffer_uptodate(bh)) {

			ext3_error(inode->i_sb, "ext3_get_inode_loc",

fs/ext3/namei.c

+1 −1
Original line number Diff line number Diff line
@@ -922,7 +922,7 @@ static struct buffer_head *ext3_find_entry(struct inode *dir, 
				bh = ext3_getblk(NULL, dir, b++, 0, &err);

				bh_use[ra_max] = bh;

				if (bh)

					ll_rw_block(READ_META, 1, &bh);

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

			}

		}

		if ((bh = bh_use[ra_ptr++]) == NULL)

fs/ext4/inode.c

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

	if (buffer_uptodate(bh))

		return bh;

	ll_rw_block(READ_META, 1, &bh);

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

	wait_on_buffer(bh);

	if (buffer_uptodate(bh))

		return bh;
@@ -3301,7 +3301,7 @@ static int __ext4_get_inode_loc(struct inode *inode, 
		trace_ext4_load_inode(inode);

		get_bh(bh);

		bh->b_end_io = end_buffer_read_sync;

		submit_bh(READ_META, bh);

		submit_bh(READ | REQ_META, bh);

		wait_on_buffer(bh);

		if (!buffer_uptodate(bh)) {

			EXT4_ERROR_INODE_BLOCK(inode, block,

fs/ext4/namei.c

+1 −1
Original line number Diff line number Diff line
@@ -922,7 +922,7 @@ static struct buffer_head * ext4_find_entry (struct inode *dir, 
				bh = ext4_getblk(NULL, dir, b++, 0, &err);

				bh_use[ra_max] = bh;

				if (bh)

					ll_rw_block(READ_META, 1, &bh);

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

			}

		}

		if ((bh = bh_use[ra_ptr++]) == NULL)

fs/gfs2/quota.c

+1 −1
Original line number Diff line number Diff line
@@ -709,7 +709,7 @@ static int gfs2_adjust_quota(struct gfs2_inode *ip, loff_t loc, 
		set_buffer_uptodate(bh);



	if (!buffer_uptodate(bh)) {

		ll_rw_block(READ_META, 1, &bh);

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

		wait_on_buffer(bh);

		if (!buffer_uptodate(bh))

			goto unlock_out;