---

yaml
---
r: 189247
b: refs/heads/master
c: 0943846
h: refs/heads/master
i:
  189245: dac8773
  189243: 28a6fc1
  189239: 31bb87f
  189231: 3cd68fd
  189215: 23b758e
  189183: 5b24364
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 723b2ff40876678b49e61df34fb1d8001e34639d
+refs/heads/master: 0943846ae05603efd98550f2d475e9c98191bde8

trunk/fs/logfs/journal.c

@@ -800,13 +800,15 @@ void do_logfs_journal_wl_pass(struct super_block *sb)
 {
 	struct logfs_super *super = logfs_super(sb);
 	struct logfs_area *area = super->s_journal_area;
+	struct btree_head32 *head = &super->s_reserved_segments;
 	u32 segno, ec;
 	int i, err;
 
 	log_journal("Journal requires wear-leveling.\n");
 	/* Drop old segments */
 	journal_for_each(i)
 		if (super->s_journal_seg[i]) {
+			btree_remove32(head, super->s_journal_seg[i]);
 			logfs_set_segment_unreserved(sb,
 					super->s_journal_seg[i],
 					super->s_journal_ec[i]);
@@ -819,6 +821,8 @@ void do_logfs_journal_wl_pass(struct super_block *sb)
 		super->s_journal_seg[i] = segno;
 		super->s_journal_ec[i] = ec;
 		logfs_set_segment_reserved(sb, segno);
+		err = btree_insert32(head, segno, (void *)1, GFP_KERNEL);
+		BUG_ON(err); /* mempool should prevent this */
 	}
 	/* Manually move journal_area */
 	freeseg(sb, area->a_segno);