diff --git a/[refs] b/[refs]
index b073a8d7e5cd..b2c9be3d607f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a2d19bced51af31d2c9ff55219400ed0a6c012f
+refs/heads/master: eabb26cacdec33ca6f6fcaee762b57c2205169ca
diff --git a/trunk/fs/logfs/journal.c b/trunk/fs/logfs/journal.c
index f46ee8b0e135..9da29706f91c 100644
--- a/trunk/fs/logfs/journal.c
+++ b/trunk/fs/logfs/journal.c
@@ -828,7 +828,7 @@ 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);
+		err = btree_insert32(head, segno, (void *)1, GFP_NOFS);
 		BUG_ON(err); /* mempool should prevent this */
 		err = logfs_erase_segment(sb, segno, 1);
 		BUG_ON(err); /* FIXME: remount-ro would be nicer */