From mboxrd@z Thu Jan  1 00:00:00 1970
From: swhiteho@redhat.com <swhiteho@redhat.com>
Date: Mon,  9 Jul 2007 17:02:52 +0100
Subject: [Cluster-devel] [PATCH] [GFS2] Addendum to the journaled
	file/unmount patch
In-Reply-To: <11839970793713-git-send-email-swhiteho@redhat.com>
References: <11839969822277-git-send-email-swhiteho@redhat.com>
	<1183996989263-git-send-email-swhiteho@redhat.com>
	<11839969911617-git-send-email-swhiteho@redhat.com>
	<1183996996300-git-send-email-swhiteho@redhat.com>
	<11839969982134-git-send-email-swhiteho@redhat.com>
	<11839970003764-git-send-email-swhiteho@redhat.com>
	<11839970032102-git-send-email-swhiteho@redhat.com>
	<11839970052865-git-send-email-swhiteho@redhat.com>
	<11839970061096-git-send-email-swhiteho@redhat.com>
	<1183997008395-git-send-email-swhiteho@redhat.com>
	<11839970101065-git-send-email-swhiteho@redhat.com>
	<11839970122624-git-send-email-swhiteho@redhat.com>
	<11839970143164-git-send-email-swhiteho@redhat.com>
	<11839970162125-git-send-email-swhiteho@redhat.com>
	<11839970182635-git-send-email-swhiteho@redhat.com>
	<11839970204036-git-send-email-swhiteho@redhat.com>
	<11839970222606-git-send-email-swhiteho@redhat.com>
	<11839970241526-git-send-email-swhiteho@redhat.com>
	<1183997026104-git-send-email-swhiteho@redhat.com>
	<11839970282009-git-send-email-swhiteho@redhat.com>
	<11839970302426-git-send-email-swhiteho@redhat.com>
	<11839970324005-git-send-email-swhiteho@redhat.com>
	<1183997034982-git-send-email-swhiteho@redhat.com>
	<1183997036270-git-send-email-swhiteho@redhat.com>
	<11839970383020-git-send-email-swhiteho@redhat.com>
	<11839970403929-git-send-email-swhiteho@redhat.com>
	<11839970421091-git-send-email-swhiteho@redhat.com>
	<11839970442448-git-send-email-swhiteho@redhat.com>
	<11839970463325-git-send-email-swhiteho@redhat.com>
	<11839970481383-git-send-email-swhiteho@redhat.com>
	<1183997050365-git-send-email-swhiteho@redhat.com>
	<11839970521835-git-send-email-swhiteho@redhat.com>
	<11839970542719-git-send-email-swhiteho@redhat.com>
	<1183997056121-git-send-email-swhiteho@redhat.com>
	<11839970573954-git-send-email-swhiteho@redhat.com>
	<11839970591207-git-send-email-swhiteho@redhat.com>
	<11839970611456-git-send-email-swhiteho@redhat.com>
	<11839970633982-git-send-email-swhiteho@redhat.com>
	<11839970653759-git-send-email-swhiteho@redhat.com>
	<1183997067333-git-send-email-swhiteho@redhat.com>
	<11839970691406-git-send-email-swhiteho@redhat.com>
	<11839970711372-git-send-email-swhiteho@redhat.com>
	<1183997073435-git-send-email-swhiteho@redhat.com>
	<11839970752058-git-send-email-swhiteho@redhat.com>
	<11839970773694-git-send-email-swhiteho@redhat.com>
	<11839970793713-git-send-email-swhiteho@redhat.com>
Message-ID: <11839970813260-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: Robert Peterson <rpeterso@redhat.com>

This patch is an addendum to the previous journaled file/unmount patch.
It fixes a problem discovered during testing.

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

diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index dd810ad..aff70f0 100644
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -472,8 +472,10 @@ static void databuf_lo_add(struct gfs2_sbd *sdp, struct gfs2_log_element *le)
 		return;
 	}
 	tr->tr_touched = 1;
-	tr->tr_num_buf++;
-	list_add(&bd->bd_list_tr, &tr->tr_list_buf);
+	if (gfs2_is_jdata(ip)) {
+		tr->tr_num_buf++;
+		list_add(&bd->bd_list_tr, &tr->tr_list_buf);
+	}
 	gfs2_log_unlock(sdp);
 	if (!list_empty(&le->le_list))
 		return;
-- 
1.5.1.2