From 9d911b55313bdaa6a6a817c2c17248c68c4c205a Mon Sep 17 00:00:00 2001 From: Prasad Joshi Date: Tue, 21 Dec 2010 17:24:19 -0800 Subject: [PATCH] --- yaml --- r: 223505 b: refs/heads/master c: eabb26cacdec33ca6f6fcaee762b57c2205169ca h: refs/heads/master i: 223503: c39d433f973d1a0ca117d207c2b261b4de6a85b0 v: v3 --- [refs] | 2 +- trunk/fs/logfs/journal.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 */