From: Steven Whitehouse <swhiteho@redhat.com>
Date: Mon, 19 Jun 2006 14:51:11 +0000 (-0400)
Subject: [GFS2] Always include glock in transaction
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b61dde795f120f5dca2c865a1860dd9ff76705a1;p=deliverable%2Flinux.git

[GFS2] Always include glock in transaction

Include the glock in the transaction, even when not journaling
data in order that ordered write data will be correctly flushed
when the lock is released.

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

diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index 93563e72ae49..af03bf380f46 100644
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -467,11 +467,11 @@ static void databuf_lo_add(struct gfs2_sbd *sdp, struct gfs2_log_element *le)
 	if (!list_empty(&bd->bd_list_tr) &&
 	    (ip->i_di.di_flags & GFS2_DIF_JDATA)) {
 		tr->tr_num_buf++;
-		gfs2_trans_add_gl(bd->bd_gl);
 		list_add(&bd->bd_list_tr, &tr->tr_list_buf);
 		gfs2_pin(sdp, bd->bd_bh);
 		tr->tr_num_buf_new++;
 	}
+	gfs2_trans_add_gl(bd->bd_gl);
 	gfs2_log_lock(sdp);
 	if (!list_empty(&le->le_list)) {
 		if (ip->i_di.di_flags & GFS2_DIF_JDATA)