[Cluster-devel] GFS2: Fix ail list traversal
Steven Whitehouse
swhiteho at redhat.com
Wed Apr 20 16:29:17 UTC 2011
In the recent patches to update the AIL list code, I managed to
forget that the ail list lock got dropped, even though I
added a comment specifically to remind myself :(
Reported-by: Barry Marson <bmarson at redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho at redhat.com>
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
index ad1f188..0f3046a 100644
--- a/fs/gfs2/log.c
+++ b/fs/gfs2/log.c
@@ -89,9 +89,9 @@ void gfs2_remove_from_ail(struct gfs2_bufdata *bd)
*
*/
-static void gfs2_ail1_start_one(struct gfs2_sbd *sdp,
- struct writeback_control *wbc,
- struct gfs2_ail *ai)
+static int gfs2_ail1_start_one(struct gfs2_sbd *sdp,
+ struct writeback_control *wbc,
+ struct gfs2_ail *ai)
__releases(&sdp->sd_ail_lock)
__acquires(&sdp->sd_ail_lock)
{
@@ -99,6 +99,7 @@ __acquires(&sdp->sd_ail_lock)
struct address_space *mapping;
struct gfs2_bufdata *bd, *s;
struct buffer_head *bh;
+ int ldrop = 0;
restart:
list_for_each_entry_safe_reverse(bd, s, &ai->ai_ail1_list, bd_ail_st_list) {
@@ -121,12 +122,15 @@ restart:
list_move(&bd->bd_ail_st_list, &ai->ai_ail1_list);
mapping = bh->b_page->mapping;
spin_unlock(&sdp->sd_ail_lock);
+ ldrop = 1;
generic_writepages(mapping, wbc);
spin_lock(&sdp->sd_ail_lock);
if (wbc->nr_to_write <= 0)
break;
goto restart;
}
+
+ return ldrop;
}
@@ -146,10 +150,12 @@ void gfs2_ail1_flush(struct gfs2_sbd *sdp, struct writeback_control *wbc)
trace_gfs2_ail_flush(sdp, wbc, 1);
spin_lock(&sdp->sd_ail_lock);
+restart:
list_for_each_entry_reverse(ai, head, ai_list) {
if (wbc->nr_to_write <= 0)
break;
- gfs2_ail1_start_one(sdp, wbc, ai); /* This may drop ail lock */
+ if (gfs2_ail1_start_one(sdp, wbc, ai))
+ goto restart;
}
spin_unlock(&sdp->sd_ail_lock);
trace_gfs2_ail_flush(sdp, wbc, 0);
More information about the Cluster-devel
mailing list