---

yaml --- r: 189246 b: refs/heads/master c: 723b2ff h: refs/heads/master v: v3
git-mirror · Mar 28, 2010 · 8164133 · 8164133
1 parent dac8773
commit 8164133
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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;