summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-06-19 16:51:11 +0200
committerSteven Whitehouse <swhiteho@redhat.com>2006-06-19 16:51:11 +0200
commitb61dde795f120f5dca2c865a1860dd9ff76705a1 (patch)
tree5757a1fdab5598e0284d280fbac32e8db0bf04e8 /fs
parentMerge branch 'master' (diff)
downloadlinux-b61dde795f120f5dca2c865a1860dd9ff76705a1.tar.xz
linux-b61dde795f120f5dca2c865a1860dd9ff76705a1.zip
[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>
Diffstat (limited to 'fs')
-rw-r--r--fs/gfs2/lops.c2
1 files changed, 1 insertions, 1 deletions
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)