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

Commit 8475487b authored by Bob Peterson's avatar Bob Peterson Committed by Steven Whitehouse
Browse files

[GFS2] Fix ordering of dirty/journal for ordered buffer unstuffing 



Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent d7b616e2

fs/gfs2/bmap.c

+2 −2
Original line number Diff line number Diff line
@@ -93,10 +93,10 @@ static int gfs2_unstuffer_page(struct gfs2_inode *ip, struct buffer_head *dibh, 
		map_bh(bh, inode->i_sb, block);



	set_buffer_uptodate(bh);

	if (sdp->sd_args.ar_data == GFS2_DATA_ORDERED || gfs2_is_jdata(ip))

		gfs2_trans_add_bh(ip->i_gl, bh, 0);

	if (!gfs2_is_jdata(ip))

		mark_buffer_dirty(bh);

	if (sdp->sd_args.ar_data == GFS2_DATA_ORDERED || gfs2_is_jdata(ip))

		gfs2_trans_add_bh(ip->i_gl, bh, 0);



	if (release) {

		unlock_page(page);