From 19b0e1e8f035c672d87b1de59d5818b4bacf3619 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Wed, 11 Oct 2006 13:34:59 -0400
Subject: [PATCH] --- yaml --- r: 39548 b: refs/heads/master c:
 fe1a698ffef5af546dd4a8cd6a1f2f202491c4ef h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 6dc058577073..e313c6b7081a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ee48af22ed6dcddea8cdf93c7f2a268cbcf0d56
+refs/heads/master: fe1a698ffef5af546dd4a8cd6a1f2f202491c4ef
diff --git a/trunk/fs/gfs2/log.c b/trunk/fs/gfs2/log.c
index 554fe5bd1b72..72eec6542d6a 100644
--- a/trunk/fs/gfs2/log.c
+++ b/trunk/fs/gfs2/log.c
@@ -569,16 +569,15 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl)
 	else if (sdp->sd_log_tail != current_tail(sdp) && !sdp->sd_log_idle)
 		log_write_header(sdp, 0, PULL);
 	lops_after_commit(sdp, ai);
-	sdp->sd_log_head = sdp->sd_log_flush_head;
 
+	gfs2_log_lock(sdp);
+	sdp->sd_log_head = sdp->sd_log_flush_head;
 	sdp->sd_log_blks_free -= sdp->sd_log_num_hdrs;
-
 	sdp->sd_log_blks_reserved = 0;
 	sdp->sd_log_commited_buf = 0;
 	sdp->sd_log_num_hdrs = 0;
 	sdp->sd_log_commited_revoke = 0;
 
-	gfs2_log_lock(sdp);
 	if (!list_empty(&ai->ai_ail1_list)) {
 		list_add(&ai->ai_list, &sdp->sd_ail1_list);
 		ai = NULL;