redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

jbd/jbd2 NULL noise

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Al Viro 2008-03-29 03:07:18 +00:00 committed by Linus Torvalds
parent af8be4e4b3
commit 1076d17ac7
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/jbd/journal.c
View file

@ -1620,14 +1620,14 @@ static int journal_init_journal_head_cache(void)
{ {
int retval; int retval;
J_ASSERT(journal_head_cache == 0); J_ASSERT(journal_head_cache == NULL);
journal_head_cache = kmem_cache_create("journal_head", journal_head_cache = kmem_cache_create("journal_head",
sizeof(struct journal_head), sizeof(struct journal_head),
0, /* offset */ 0, /* offset */
SLAB_TEMPORARY, /* flags */ SLAB_TEMPORARY, /* flags */
NULL); /* ctor */ NULL); /* ctor */
retval = 0; retval = 0;
if (journal_head_cache == 0) { if (!journal_head_cache) {
retval = -ENOMEM; retval = -ENOMEM;
printk(KERN_EMERG "JBD: no memory for journal_head cache\n"); printk(KERN_EMERG "JBD: no memory for journal_head cache\n");
} }

4
fs/jbd/revoke.c
View file

@ -173,13 +173,13 @@ int __init journal_init_revoke_caches(void)
0, 0,
SLAB_HWCACHE_ALIGN|SLAB_TEMPORARY, SLAB_HWCACHE_ALIGN|SLAB_TEMPORARY,
NULL); NULL);
if (revoke_record_cache == 0) if (!revoke_record_cache)
return -ENOMEM; return -ENOMEM;
revoke_table_cache = kmem_cache_create("revoke_table", revoke_table_cache = kmem_cache_create("revoke_table",
sizeof(struct jbd_revoke_table_s), sizeof(struct jbd_revoke_table_s),
0, SLAB_TEMPORARY, NULL); 0, SLAB_TEMPORARY, NULL);
if (revoke_table_cache == 0) { if (!revoke_table_cache) {
kmem_cache_destroy(revoke_record_cache); kmem_cache_destroy(revoke_record_cache);
revoke_record_cache = NULL; revoke_record_cache = NULL;
return -ENOMEM; return -ENOMEM;

12
fs/jbd2/journal.c
View file

@ -219,7 +219,7 @@ static int jbd2_journal_start_thread(journal_t *journal)
if (IS_ERR(t)) if (IS_ERR(t))
return PTR_ERR(t); return PTR_ERR(t);
wait_event(journal->j_wait_done_commit, journal->j_task != 0); wait_event(journal->j_wait_done_commit, journal->j_task != NULL);
return 0; return 0;
} }
@ -231,7 +231,7 @@ static void journal_kill_thread(journal_t *journal)
while (journal->j_task) { while (journal->j_task) {
wake_up(&journal->j_wait_commit); wake_up(&journal->j_wait_commit);
spin_unlock(&journal->j_state_lock); spin_unlock(&journal->j_state_lock);
wait_event(journal->j_wait_done_commit, journal->j_task == 0); wait_event(journal->j_wait_done_commit, journal->j_task == NULL);
spin_lock(&journal->j_state_lock); spin_lock(&journal->j_state_lock);
} }
spin_unlock(&journal->j_state_lock); spin_unlock(&journal->j_state_lock);
@ -1969,14 +1969,14 @@ static int journal_init_jbd2_journal_head_cache(void)
{ {
int retval; int retval;
J_ASSERT(jbd2_journal_head_cache == 0); J_ASSERT(jbd2_journal_head_cache == NULL);
jbd2_journal_head_cache = kmem_cache_create("jbd2_journal_head", jbd2_journal_head_cache = kmem_cache_create("jbd2_journal_head",
sizeof(struct journal_head), sizeof(struct journal_head),
0, /* offset */ 0, /* offset */
SLAB_TEMPORARY, /* flags */ SLAB_TEMPORARY, /* flags */
NULL); /* ctor */ NULL); /* ctor */
retval = 0; retval = 0;
if (jbd2_journal_head_cache == 0) { if (!jbd2_journal_head_cache) {
retval = -ENOMEM; retval = -ENOMEM;
printk(KERN_EMERG "JBD: no memory for journal_head cache\n"); printk(KERN_EMERG "JBD: no memory for journal_head cache\n");
} }
@ -2002,14 +2002,14 @@ static struct journal_head *journal_alloc_journal_head(void)
atomic_inc(&nr_journal_heads); atomic_inc(&nr_journal_heads);
#endif #endif
ret = kmem_cache_alloc(jbd2_journal_head_cache, GFP_NOFS); ret = kmem_cache_alloc(jbd2_journal_head_cache, GFP_NOFS);
if (ret == 0) { if (!ret) {
jbd_debug(1, "out of memory for journal_head\n"); jbd_debug(1, "out of memory for journal_head\n");
if (time_after(jiffies, last_warning + 5*HZ)) { if (time_after(jiffies, last_warning + 5*HZ)) {
printk(KERN_NOTICE "ENOMEM in %s, retrying.\n", printk(KERN_NOTICE "ENOMEM in %s, retrying.\n",
__FUNCTION__); __FUNCTION__);
last_warning = jiffies; last_warning = jiffies;
} }
while (ret == 0) { while (!ret) {
yield(); yield();
ret = kmem_cache_alloc(jbd2_journal_head_cache, GFP_NOFS); ret = kmem_cache_alloc(jbd2_journal_head_cache, GFP_NOFS);
} }

4
fs/jbd2/revoke.c
View file

@ -174,13 +174,13 @@ int __init jbd2_journal_init_revoke_caches(void)
0, 0,
SLAB_HWCACHE_ALIGN|SLAB_TEMPORARY, SLAB_HWCACHE_ALIGN|SLAB_TEMPORARY,
NULL); NULL);
if (jbd2_revoke_record_cache == 0) if (!jbd2_revoke_record_cache)
return -ENOMEM; return -ENOMEM;
jbd2_revoke_table_cache = kmem_cache_create("jbd2_revoke_table", jbd2_revoke_table_cache = kmem_cache_create("jbd2_revoke_table",
sizeof(struct jbd2_revoke_table_s), sizeof(struct jbd2_revoke_table_s),
0, SLAB_TEMPORARY, NULL); 0, SLAB_TEMPORARY, NULL);
if (jbd2_revoke_table_cache == 0) { if (!jbd2_revoke_table_cache) {
kmem_cache_destroy(jbd2_revoke_record_cache); kmem_cache_destroy(jbd2_revoke_record_cache);
jbd2_revoke_record_cache = NULL; jbd2_revoke_record_cache = NULL;
return -ENOMEM; return -ENOMEM;