From 3f802277b985e1f63b4a2eb2e19ab04063de2b45 Mon Sep 17 00:00:00 2001
From: Joern Engel <joern@logfs.org>
Date: Mon, 29 Mar 2010 21:14:52 +0200
Subject: [PATCH] --- yaml --- r: 189248 b: refs/heads/master c:
 6be7fa06eb4d721df734bd0946b5e63b27c0589b h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/fs/logfs/journal.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 832ccb724adc..ddec6276b0b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0943846ae05603efd98550f2d475e9c98191bde8
+refs/heads/master: 6be7fa06eb4d721df734bd0946b5e63b27c0589b
diff --git a/trunk/fs/logfs/journal.c b/trunk/fs/logfs/journal.c
index 25b1345c4652..d57c7b07b60b 100644
--- a/trunk/fs/logfs/journal.c
+++ b/trunk/fs/logfs/journal.c
@@ -823,6 +823,8 @@ void do_logfs_journal_wl_pass(struct super_block *sb)
 		logfs_set_segment_reserved(sb, segno);
 		err = btree_insert32(head, segno, (void *)1, GFP_KERNEL);
 		BUG_ON(err); /* mempool should prevent this */
+		err = logfs_erase_segment(sb, segno, 1);
+		BUG_ON(err); /* FIXME: remount-ro would be nicer */
 	}
 	/* Manually move journal_area */
 	freeseg(sb, area->a_segno);