From: Pekka Enberg This patch replaces yield and retry loop with __GFP_NOFAIL in alloc_journal_list(). Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton --- fs/reiserfs/journal.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff -puN fs/reiserfs/journal.c~reiserfs-use-__gfp_nofail-instead-of-yield-and-retry-loop fs/reiserfs/journal.c --- devel/fs/reiserfs/journal.c~reiserfs-use-__gfp_nofail-instead-of-yield-and-retry-loop 2006-01-12 23:41:39.000000000 -0800 +++ devel-akpm/fs/reiserfs/journal.c 2006-01-12 23:41:39.000000000 -0800 @@ -2446,12 +2446,8 @@ static int journal_read(struct super_blo 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); _