From: Joern Engel <joern@logfs.org>
Date: Mon, 29 Mar 2010 19:14:52 +0000 (+0200)
Subject: [LogFS] Erase new journal segments
X-Git-Tag: v2.6.34-rc3~3^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=6be7fa06eb4d721df734bd0946b5e63b27c0589b;p=~emulex%2Finfiniband.git

[LogFS] Erase new journal segments

If the device contains on old logfs image and the journal is moved to
segment that have never been used by the current logfs and not all
journal segments are erased before the next mount, the old content can
confuse mount code.  To prevent this, always erase the new journal
segments.

Signed-off-by: Joern Engel <joern@logfs.org>
---

diff --git a/fs/logfs/journal.c b/fs/logfs/journal.c
index 25b1345c465..d57c7b07b60 100644
--- a/fs/logfs/journal.c
+++ b/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);