---

yaml --- r: 14808 b: refs/heads/master c: 576f6d7 h: refs/heads/master v: v3
git-mirror · Nov 30, 2005 · 657adbd · 657adbd
1 parent 5c89aca
commit 657adbd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f232a125bf86b0dae09f8ea4a0553535cf6b658
+refs/heads/master: 576f6d79564d0d2c1f43088e6805674d2e122935
diff --git a/trunk/fs/reiserfs/journal.c b/trunk/fs/reiserfs/journal.c
@@ -2757,6 +2757,15 @@ int journal_init(struct super_block *p_s_sb, const char *j_dev_name,
 	journal->j_cnode_used = 0;
 	journal->j_must_wait = 0;
 
+	if (journal->j_cnode_free == 0) {
+        	reiserfs_warning(p_s_sb, "journal-2004: Journal cnode memory "
+		                 "allocation failed (%ld bytes). Journal is "
+		                 "too large for available memory. Usually "
+		                 "this is due to a journal that is too large.",
+		                 sizeof (struct reiserfs_journal_cnode) * num_cnodes);
+        	goto free_and_return;
+	}
+
 	init_journal_hash(p_s_sb);
 	jl = journal->j_current_jl;
 	jl->j_list_bitmap = get_list_bitmap(p_s_sb, jl);