From: Steven Whitehouse <swhiteho@redhat.com>
To: cluster-devel@redhat.com, linux-kernel@vger.kernel.org
Cc: Steven Whitehouse <swhiteho@redhat.com>
Subject: [PATCH 03/24] GFS2: Fix bug-trap in ail flush code
Date: Mon, 24 Oct 2011 13:48:17 +0100 [thread overview]
Message-ID: <1319460518-9046-4-git-send-email-swhiteho@redhat.com> (raw)
In-Reply-To: <1319460518-9046-1-git-send-email-swhiteho@redhat.com>
The assert was being tested under the wrong lock, a
legacy of the original code. Also, if it does trigger,
the resulting information was not always a lot of help.
This moves the patch under the correct lock and also
prints out more useful information in tacking down the
source of the problem.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
index da21eca..99df483 100644
--- a/fs/gfs2/glops.c
+++ b/fs/gfs2/glops.c
@@ -28,6 +28,17 @@
#include "trans.h"
#include "dir.h"
+static void gfs2_ail_error(struct gfs2_glock *gl, const struct buffer_head *bh)
+{
+ fs_err(gl->gl_sbd, "AIL buffer %p: blocknr %llu state 0x%08lx mapping %p page state 0x%lx\n",
+ bh, (unsigned long long)bh->b_blocknr, bh->b_state,
+ bh->b_page->mapping, bh->b_page->flags);
+ fs_err(gl->gl_sbd, "AIL glock %u:%llu mapping %p\n",
+ gl->gl_name.ln_type, gl->gl_name.ln_number,
+ gfs2_glock2aspace(gl));
+ gfs2_lm_withdraw(gl->gl_sbd, "AIL error\n");
+}
+
/**
* __gfs2_ail_flush - remove all buffers for a given lock from the AIL
* @gl: the glock
@@ -41,20 +52,24 @@ static void __gfs2_ail_flush(struct gfs2_glock *gl)
struct list_head *head = &gl->gl_ail_list;
struct gfs2_bufdata *bd;
struct buffer_head *bh;
+ sector_t blocknr;
spin_lock(&sdp->sd_ail_lock);
while (!list_empty(head)) {
bd = list_entry(head->next, struct gfs2_bufdata,
bd_ail_gl_list);
bh = bd->bd_bh;
- gfs2_remove_from_ail(bd);
- bd->bd_bh = NULL;
+ blocknr = bh->b_blocknr;
+ if (buffer_busy(bh))
+ gfs2_ail_error(gl, bh);
bh->b_private = NULL;
+ gfs2_remove_from_ail(bd); /* drops ref on bh */
spin_unlock(&sdp->sd_ail_lock);
- bd->bd_blkno = bh->b_blocknr;
+ bd->bd_bh = NULL;
+ bd->bd_blkno = blocknr;
+
gfs2_log_lock(sdp);
- gfs2_assert_withdraw(sdp, !buffer_busy(bh));
gfs2_trans_add_revoke(sdp, bd);
gfs2_log_unlock(sdp);
--
1.7.4.4
next prev parent reply other threads:[~2011-10-24 12:47 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-24 12:48 GFS2: Pre-pull patch posting (merge window) Steven Whitehouse
2011-10-24 12:48 ` [PATCH 01/24] GFS2: Clean up dir hash table reading Steven Whitehouse
2011-10-24 12:48 ` [PATCH 02/24] GFS2: Split data write & wait in fsync Steven Whitehouse
2011-10-24 12:48 ` Steven Whitehouse [this message]
2011-10-24 12:48 ` [PATCH 04/24] GFS2: Make atime checks more efficient Steven Whitehouse
2011-10-24 12:48 ` [PATCH 05/24] GFS2: Fix inode allocation error path Steven Whitehouse
2011-10-24 12:48 ` [PATCH 06/24] GFS2: Fix bug trap and journaled data fsync Steven Whitehouse
2011-10-24 12:48 ` [PATCH 07/24] GFS2: Use ->dirty_inode() Steven Whitehouse
2011-10-24 12:48 ` [PATCH 08/24] GFS2: Clean up gfs2_create Steven Whitehouse
2011-10-24 12:48 ` [PATCH 09/24] GFS2: Fix lseek after SEEK_DATA, SEEK_HOLE have been added Steven Whitehouse
2011-10-25 7:54 ` Andi Kleen
2011-10-24 12:48 ` [PATCH 10/24] GFS2: Use rbtree for resource groups and clean up bitmap buffer ref count scheme Steven Whitehouse
2011-10-24 12:48 ` [PATCH 11/24] GFS2: Make resource groups "append only" during life of fs Steven Whitehouse
2011-10-24 12:48 ` [PATCH 12/24] GFS2: Cache the most recently used resource group in the inode Steven Whitehouse
2011-10-24 12:48 ` [PATCH 13/24] GFS2: Remove obsolete assert Steven Whitehouse
2011-10-24 12:48 ` [PATCH 14/24] GFS2: Call do_strip() directly from recursive_scan() Steven Whitehouse
2011-10-24 12:48 ` [PATCH 15/24] GFS2: Use cached rgrp in gfs2_rlist_add() Steven Whitehouse
2011-10-24 12:48 ` [PATCH 16/24] GFS2: Fix AIL flush issue during fsync Steven Whitehouse
2011-10-24 12:48 ` [PATCH 17/24] GFS2: Correctly set goal block after allocation Steven Whitehouse
2011-10-24 12:48 ` [PATCH 18/24] GFS2: Clean up ->page_mkwrite Steven Whitehouse
2011-10-24 12:48 ` [PATCH 19/24] GFS2: Fix off-by-one in gfs2_blk2rgrpd Steven Whitehouse
2011-10-24 12:48 ` [PATCH 20/24] GFS2: speed up delete/unlink performance for large files Steven Whitehouse
2011-10-24 12:48 ` [PATCH 21/24] GFS2: rewrite fallocate code to write blocks directly Steven Whitehouse
2011-10-24 12:48 ` [PATCH 22/24] GFS2: Misc fixes Steven Whitehouse
2011-10-24 12:48 ` [PATCH 23/24] GFS2: Remove two unused variables Steven Whitehouse
2011-10-24 12:48 ` [PATCH 24/24] GFS2: Move readahead of metadata during deallocation into its own function Steven Whitehouse
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=1319460518-9046-4-git-send-email-swhiteho@redhat.com \
--to=swhiteho@redhat.com \
--cc=cluster-devel@redhat.com \
--cc=linux-kernel@vger.kernel.org \
/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
all inboxes | Powered by JetHome®