From 81641335edb81f776721a06f2bcd7891b1567b43 Mon Sep 17 00:00:00 2001
From: Joern Engel <joern@logfs.org>
Date: Sun, 28 Mar 2010 18:10:07 +0200
Subject: [PATCH] --- yaml --- r: 189246 b: refs/heads/master c:
 723b2ff40876678b49e61df34fb1d8001e34639d h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/fs/logfs/journal.c | 1 +
 trunk/fs/logfs/logfs.h   | 1 +
 trunk/fs/logfs/segment.c | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3494088f2a72..36ecc56ef59d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81def6b9862764924a99ac1b680e73ac8c80ac64
+refs/heads/master: 723b2ff40876678b49e61df34fb1d8001e34639d
diff --git a/trunk/fs/logfs/journal.c b/trunk/fs/logfs/journal.c
index 6ad30a4c9052..15454ac7bd93 100644
--- a/trunk/fs/logfs/journal.c
+++ b/trunk/fs/logfs/journal.c
@@ -821,6 +821,7 @@ void do_logfs_journal_wl_pass(struct super_block *sb)
 		logfs_set_segment_reserved(sb, segno);
 	}
 	/* Manually move journal_area */
+	freeseg(sb, area->a_segno);
 	area->a_segno = super->s_journal_seg[0];
 	area->a_is_open = 0;
 	area->a_used_bytes = 0;
diff --git a/trunk/fs/logfs/logfs.h b/trunk/fs/logfs/logfs.h
index 129779431373..b84b0eec6024 100644
--- a/trunk/fs/logfs/logfs.h
+++ b/trunk/fs/logfs/logfs.h
@@ -587,6 +587,7 @@ void move_page_to_btree(struct page *page);
 int logfs_init_mapping(struct super_block *sb);
 void logfs_sync_area(struct logfs_area *area);
 void logfs_sync_segments(struct super_block *sb);
+void freeseg(struct super_block *sb, u32 segno);
 
 /* area handling */
 int logfs_init_areas(struct super_block *sb);
diff --git a/trunk/fs/logfs/segment.c b/trunk/fs/logfs/segment.c
index ff9d7f3b4d36..0ecd8f07c11e 100644
--- a/trunk/fs/logfs/segment.c
+++ b/trunk/fs/logfs/segment.c
@@ -691,7 +691,7 @@ int logfs_segment_delete(struct inode *inode, struct logfs_shadow *shadow)
 	return 0;
 }
 
-static void freeseg(struct super_block *sb, u32 segno)
+void freeseg(struct super_block *sb, u32 segno)
 {
 	struct logfs_super *super = logfs_super(sb);
 	struct address_space *mapping = super->s_mapping_inode->i_mapping;