public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
From: Bob Peterson <rpeterso@fedoraproject.org>
To: cluster-cvs-relay@redhat.com
Subject: cluster: RHEL48 - Fix hang due to gfs_log_dump.
Date: Fri, 17 Apr 2009 13:28:00 -0000	[thread overview]
Message-ID: <20090417132813.4BAC112026B@lists.fedorahosted.org> (raw)

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=f393946c1151506581cfba02c7ed45726ca8b1f7
Commit:        f393946c1151506581cfba02c7ed45726ca8b1f7
Parent:        710344770021dd05036cbea66da3e5213c0904e7
Author:        Bob Peterson <rpeterso@redhat.com>
AuthorDate:    Wed Apr 15 13:22:21 2009 -0500
Committer:     Bob Peterson <rpeterso@redhat.com>
CommitterDate: Wed Apr 15 13:27:37 2009 -0500

Fix hang due to gfs_log_dump.

bz 495514

Since function gfs_log_dump can call gfs_log_reserve,
which can in turn call gfs_log_flush, we need to call it
outside of the relatively new sd_log_flush_lock.
---
 gfs-kernel/src/gfs/log.c |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/gfs-kernel/src/gfs/log.c b/gfs-kernel/src/gfs/log.c
index a79e154..63ad8c0 100644
--- a/gfs-kernel/src/gfs/log.c
+++ b/gfs-kernel/src/gfs/log.c
@@ -1031,11 +1031,6 @@ log_flush_internal(struct gfs_sbd *sdp, struct gfs_glock *gl)
 		sdp->sd_vfs->s_dirt = FALSE;
 
 	gfs_log_unlock(sdp);
-
-	/*  Dump if we need to.  */
-
-	if (test_bit(SDF_NEED_LOG_DUMP, &sdp->sd_flags))
-		gfs_log_dump(sdp, FALSE);
 }
 
 /**
@@ -1050,6 +1045,11 @@ gfs_log_flush(struct gfs_sbd *sdp)
 	down(&sdp->sd_log_flush_lock); /* unlocked in gfs_sync_buf */
 	log_flush_internal(sdp, NULL);
 	up(&sdp->sd_log_flush_lock); /* locked in log_flush_internal */
+
+	/*  Dump if we need to.  */
+
+	if (test_bit(SDF_NEED_LOG_DUMP, &sdp->sd_flags))
+		gfs_log_dump(sdp, FALSE);
 }
 
 /**
@@ -1140,6 +1140,11 @@ gfs_log_flush_glock(struct gfs_glock *gl, int flags)
 	if (flags)
 		gfs_sync_buf(gl, flags | DIO_CHECK);
 	up(&sdp->sd_log_flush_lock);
+
+	/*  Dump if we need to.  */
+
+	if (test_bit(SDF_NEED_LOG_DUMP, &sdp->sd_flags))
+		gfs_log_dump(sdp, FALSE);
 }
 
 /**


                 reply	other threads:[~2009-04-17 13:28 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090417132813.4BAC112026B@lists.fedorahosted.org \
    --to=rpeterso@fedoraproject.org \
    --cc=cluster-cvs-relay@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).