---

yaml --- r: 189248 b: refs/heads/master c: 6be7fa0 h: refs/heads/master v: v3
git-mirror · Mar 29, 2010 · 3f80227 · 3f80227
1 parent 7cc78d4
commit 3f80227
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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);