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

Commit 20ed0535 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

GFS2: Fix up REQ flags 



Christoph has split up REQ_PRIO from REQ_META. That means that
we can drop REQ_PRIO from places where is it not needed. I'm
not at all sure that the combination WRITE_FLUSH_FUA | REQ_PRIO
makes any kind of sense, anyway.

In addition, I've added REQ_META to one place in the code where
it was missing. REQ_PRIO has been left for read/writes triggered
by glock acquisition and writeback only. We can adjust it again
if required, but these are the most important points from a
performance perspective.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
Cc: Christoph Hellwig <hch@infradead.org>
parent 1ea6b8f4

fs/gfs2/log.c

+1 −1
Original line number Diff line number Diff line
@@ -626,7 +626,7 @@ static void log_write_header(struct gfs2_sbd *sdp, u32 flags, int pull) 
	if (test_bit(SDF_NOBARRIERS, &sdp->sd_flags))

		submit_bh(WRITE_SYNC | REQ_META | REQ_PRIO, bh);

	else

		submit_bh(WRITE_FLUSH_FUA | REQ_META | REQ_PRIO, bh);

		submit_bh(WRITE_FLUSH_FUA | REQ_META, bh);

	wait_on_buffer(bh);



	if (!buffer_uptodate(bh))

fs/gfs2/meta_io.c

+2 −2
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ struct buffer_head *gfs2_meta_ra(struct gfs2_glock *gl, u64 dblock, u32 extlen) 
	if (buffer_uptodate(first_bh))

		goto out;

	if (!buffer_locked(first_bh))

		ll_rw_block(READ_SYNC | REQ_META | REQ_PRIO, 1, &first_bh);

		ll_rw_block(READ_SYNC | REQ_META, 1, &first_bh);



	dblock++;

	extlen--;
@@ -444,7 +444,7 @@ struct buffer_head *gfs2_meta_ra(struct gfs2_glock *gl, u64 dblock, u32 extlen) 
		bh = gfs2_getbuf(gl, dblock, CREATE);



		if (!buffer_uptodate(bh) && !buffer_locked(bh))

			ll_rw_block(READA, 1, &bh);

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

		brelse(bh);

		dblock++;

		extlen--;

fs/gfs2/ops_fstype.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static int gfs2_read_super(struct gfs2_sbd *sdp, sector_t sector, int silent) 


	bio->bi_end_io = end_bio_io_page;

	bio->bi_private = page;

	submit_bio(READ_SYNC | REQ_META | REQ_PRIO, bio);

	submit_bio(READ_SYNC | REQ_META, bio);

	wait_on_page_locked(page);

	bio_put(bio);

	if (!PageUptodate(page)) {

fs/gfs2/quota.c

+1 −1
Original line number Diff line number Diff line
@@ -712,7 +712,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 | REQ_META | REQ_PRIO, 1, &bh);

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

		wait_on_buffer(bh);

		if (!buffer_uptodate(bh))

			goto unlock_out;