From 8a4bae2b5fafdc2c41f09b76de8fe45bb1dc804a Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Mon, 27 Aug 2007 09:49:37 +0100
Subject: [PATCH] --- yaml --- r: 67677 b: refs/heads/master c:
 eaf965270ffff3086ef929e660ace45e862cfd2d h: refs/heads/master i:   67675:
 b45b245c484da75690bcf130b5d9822ca3295253 v: v3

---
 [refs]               | 2 +-
 trunk/fs/gfs2/bmap.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 66659fecdcd6..6db40a8e7af8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e1a3d03e927d39282208aed676e49d25129feea
+refs/heads/master: eaf965270ffff3086ef929e660ace45e862cfd2d
diff --git a/trunk/fs/gfs2/bmap.c b/trunk/fs/gfs2/bmap.c
index 9b8990444e6c..1e56f4de7358 100644
--- a/trunk/fs/gfs2/bmap.c
+++ b/trunk/fs/gfs2/bmap.c
@@ -95,7 +95,8 @@ static int gfs2_unstuffer_page(struct gfs2_inode *ip, struct buffer_head *dibh,
 	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);
-	mark_buffer_dirty(bh);
+	if (!gfs2_is_jdata(ip))
+		mark_buffer_dirty(bh);
 
 	if (release) {
 		unlock_page(page);