From mboxrd@z Thu Jan  1 00:00:00 1970
From: swhiteho@redhat.com <swhiteho@redhat.com>
Date: Thu,  4 Oct 2007 09:49:30 +0100
Subject: [Cluster-devel] [PATCH 37/51] [GFS2] Fix ordering of dirty/journal
	for ordered buffer unstuffing
In-Reply-To: <11914878551328-git-send-email-swhiteho@redhat.com>
References: <11914877842142-git-send-email-swhiteho@redhat.com>
	<11914877912880-git-send-email-swhiteho@redhat.com>
	<11914877934041-git-send-email-swhiteho@redhat.com>
	<11914877952291-git-send-email-swhiteho@redhat.com>
	<11914877971413-git-send-email-swhiteho@redhat.com>
	<11914877993073-git-send-email-swhiteho@redhat.com>
	<11914878002186-git-send-email-swhiteho@redhat.com>
	<1191487802255-git-send-email-swhiteho@redhat.com>
	<11914878043598-git-send-email-swhiteho@redhat.com>
	<11914878063121-git-send-email-swhiteho@redhat.com>
	<11914878081562-git-send-email-swhiteho@redhat.com>
	<11914878102813-git-send-email-swhiteho@redhat.com>
	<1191487812928-git-send-email-swhiteho@redhat.com>
	<11914878141625-git-send-email-swhiteho@redhat.com>
	<1191487815172-git-send-email-swhiteho@redhat.com>
	<11914878173677-git-send-email-swhiteho@redhat.com>
	<11914878191964-git-send-email-swhiteho@redhat.com>
	<11914878214113-git-send-email-swhiteho@redhat.com>
	<11914878231394-git-send-email-swhiteho@redhat.com>
	<11914878252873-git-send-email-swhiteho@redhat.com>
	<11914878271468-git-send-email-swhiteho@redhat.com>
	<11914878283252-git-send-email-swhiteho@redhat.com>
	<11914878304004-git-send-email-swhiteho@redhat.com>
	<11914878323899-git-send-email-swhiteho@redhat.com>
	<11914878342921-git-send-email-swhiteho@redhat.com>
	<11914878361239-git-send-email-swhiteho@redhat.com>
	<11914878383633-git-send-email-swhiteho@redhat.com>
	<11914878401428-git-send-email-swhiteho@redhat.com>
	<11914878422398-git-send-email-swhiteho@redhat.com>
	<1191487844772-git-send-email-swhiteho@redhat.com>
	<1191487846406-git-send-email-swhiteho@redhat.com>
	<11914878472056-git-send-email-swhiteho@redhat.com>
	<11914878492645-git-send-email-swhiteho@redhat.com>
	<11914878513555-git-send-email-swhiteho@redhat.com>
	<11914878521254-git-send-email-swhiteho@redhat.com>
	<119148785427-git-send-email-swhiteho@redhat.com>
	<11914878551328-git-send-email-swhiteho@redhat.com>
Message-ID: <11914878571888-git-send-email-swhiteho@redhat.com>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

From: Bob Peterson <rpeterso@redhat.com>

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index 1e56f4d..93fa427 100644
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@ -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);
-- 
1.5.1.2