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

Commit 9f203507 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

ext4: mark all metadata I/O with REQ_META 



As Dave Chinner pointed out at the 2013 LSF/MM workshop, it's
important that metadata I/O requests are marked as such to avoid
priority inversions caused by I/O bandwidth throttling.

Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent c4d8b023

fs/ext4/balloc.c

+1 −1
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ ext4_read_block_bitmap_nowait(struct super_block *sb, ext4_group_t block_group) 
	trace_ext4_read_block_bitmap_load(sb, block_group);

	bh->b_end_io = ext4_end_bitmap_read;

	get_bh(bh);

	submit_bh(READ, bh);

	submit_bh(READ | REQ_META | REQ_PRIO, bh);

	return bh;

verify:

	ext4_validate_block_bitmap(sb, desc, block_group, bh);

fs/ext4/ialloc.c

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ ext4_read_inode_bitmap(struct super_block *sb, ext4_group_t block_group) 
	trace_ext4_load_inode_bitmap(sb, block_group);

	bh->b_end_io = ext4_end_bitmap_read;

	get_bh(bh);

	submit_bh(READ, bh);

	submit_bh(READ | REQ_META | REQ_PRIO, bh);

	wait_on_buffer(bh);

	if (!buffer_uptodate(bh)) {

		put_bh(bh);

fs/ext4/mmp.c

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static int write_mmp_block(struct super_block *sb, struct buffer_head *bh) 
	lock_buffer(bh);

	bh->b_end_io = end_buffer_write_sync;

	get_bh(bh);

	submit_bh(WRITE_SYNC, bh);

	submit_bh(WRITE_SYNC | REQ_META | REQ_PRIO, bh);

	wait_on_buffer(bh);

	sb_end_write(sb);

	if (unlikely(!buffer_uptodate(bh)))
@@ -86,7 +86,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh, 
		get_bh(*bh);

		lock_buffer(*bh);

		(*bh)->b_end_io = end_buffer_read_sync;

		submit_bh(READ_SYNC, *bh);

		submit_bh(READ_SYNC | REQ_META | REQ_PRIO, *bh);

		wait_on_buffer(*bh);

		if (!buffer_uptodate(*bh)) {

			brelse(*bh);

fs/ext4/super.c

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

	}

	journal->j_private = sb;

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

	ll_rw_block(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");