---

yaml --- r: 19452 b: refs/heads/master c: 8c777cc h: refs/heads/master v: v3
git-mirror · Feb 1, 2006 · ec9723c · ec9723c
1 parent 92d272e
commit ec9723c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d739b42b82773206297db1fc0d96ef895a5d9688
+refs/heads/master: 8c777cc4be1390862d053cbc002246e87572147b
diff --git a/trunk/fs/reiserfs/journal.c b/trunk/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);