summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2006-02-01 03:06:43 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-01 08:53:25 -0800
commit8c777cc4be1390862d053cbc002246e87572147b (patch)
treed8149bdfd5a6ce17e273aff5d7a2adaddd098d8d
parentd739b42b82773206297db1fc0d96ef895a5d9688 (diff)
downloadop-kernel-dev-8c777cc4be1390862d053cbc002246e87572147b.zip
op-kernel-dev-8c777cc4be1390862d053cbc002246e87572147b.tar.gz
[PATCH] reiserfs: use __GFP_NOFAIL instead of yield and retry loop for allocation
This patch replaces yield and retry loop with __GFP_NOFAIL in alloc_journal_list(). Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--fs/reiserfs/journal.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
index 16b526f..2d04efb 100644
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
@@ -2446,12 +2446,8 @@ static int journal_read(struct super_block *p_s_sb)
static struct reiserfs_journal_list *alloc_journal_list(struct super_block *s)
{
struct reiserfs_journal_list *jl;
- retry:
- jl = kzalloc(sizeof(struct reiserfs_journal_list), GFP_NOFS);
- if (!jl) {
- yield();
- goto retry;
- }
+ jl = kzalloc(sizeof(struct reiserfs_journal_list),
+ GFP_NOFS | __GFP_NOFAIL);
INIT_LIST_HEAD(&jl->j_list);
INIT_LIST_HEAD(&jl->j_working_list);
INIT_LIST_HEAD(&jl->j_tail_bh_list);
OpenPOWER on IntegriCloud