[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>

1 files changed, 2 insertions, 6 deletions

diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
index 16b526fd20b9..2d04efb22eea 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);