jbd/jbd2: sparse warnings in revoke.c, journal.c
PATCH 1/1 jbd/jbd2: sparse warnings in revoke.c, journal.c
fs/jbd/revoke.c:176:29: warning: Using plain integer as NULL pointer fs/jbd/revoke.c:182:28: warning: Using plain integer as NULL pointer fs/jbd/journal.c:1622:2: warning: Using plain integer as NULL pointer fs/jbd/journal.c:1629:28: warning: Using plain integer as NULL pointer
fs/jbd2/revoke.c:177:34: warning: Using plain integer as NULL pointer fs/jbd2/revoke.c:183:33: warning: Using plain integer as NULL pointer fs/jbd2/journal.c:222:2: warning: Using plain integer as NULL pointer fs/jbd2/journal.c:222:2: warning: Using plain integer as NULL pointer fs/jbd2/journal.c:234:3: warning: Using plain integer as NULL pointer fs/jbd2/journal.c:234:3: warning: Using plain integer as NULL pointer fs/jbd2/journal.c:1972:2: warning: Using plain integer as NULL pointer fs/jbd2/journal.c:1979:33: warning: Using plain integer as NULL pointer fs/jbd2/journal.c:2005:13: warning: Using plain integer as NULL pointer fs/jbd2/journal.c:2012:17: warning: Using plain integer as NULL pointer
--- fs/jbd/journal.c | 4 ++-- fs/jbd/revoke.c | 4 ++-- fs/jbd2/journal.c | 12 ++++++------ fs/jbd2/revoke.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-)
fs/jbd/journal.c +2 -2
@@ -1619,14 +1619,14 @@ static int journal_init_journal_head_cache(void) {int retval; -J_ASSERT (journal_head_cache ==0 ); +J_ASSERT (!journal_head_cache); journal_head_cache =kmem_cache_create ("journal_head" ,sizeof (struct journal_head ),0 ,/* offset */ SLAB_TEMPORARY ,/* flags */ NULL );/* ctor */ retval =0 ; -if (journal_head_cache ==0 ) { +if (!journal_head_cache) { retval = -ENOMEM ;printk (KERN_EMERG "JBD: no memory for journal_head cache\n" ); }
fs/jbd/revoke.c +2 -2
@@ -173,13 +173,13 @@ int __init journal_init_revoke_caches(void)0 ,SLAB_HWCACHE_ALIGN |SLAB_TEMPORARY , NULL); -if (revoke_record_cache ==0 ) +if (!revoke_record_cache)return -ENOMEM ; revoke_table_cache =kmem_cache_create ("revoke_table" ,sizeof (struct jbd_revoke_table_s ),0 ,SLAB_TEMPORARY ,NULL ); -if (revoke_table_cache ==0 ) { +if (!revoke_table_cache) {kmem_cache_destroy (revoke_record_cache); revoke_record_cache =NULL ;return -ENOMEM ;
fs/jbd2/journal.c +6 -6
@@ -219,7 +219,7 @@ static int jbd2_journal_start_thread(journal_t *journal)if (IS_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 ; }
@@ -231,7 +231,7 @@ static void journal_kill_thread(journal_t *journal)while (journal->j_task) {wake_up (&journal->j_wait_commit);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_unlock (&journal->j_state_lock);
@@ -1969,14 +1969,14 @@ static int journal_init_jbd2_journal_head_cache(void) {int retval; -J_ASSERT (jbd2_journal_head_cache ==0 ); +J_ASSERT (!jbd2_journal_head_cache); jbd2_journal_head_cache =kmem_cache_create ("jbd2_journal_head" ,sizeof (struct journal_head ),0 ,/* offset */ SLAB_TEMPORARY ,/* flags */ NULL );/* ctor */ retval =0 ; -if (jbd2_journal_head_cache ==0 ) { +if (!jbd2_journal_head_cache) { retval = -ENOMEM ;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);#endif 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" );if (time_after (jiffies, last_warning +5 *HZ )) {printk (KERN_NOTICE "ENOMEM in %s, retrying.\n" , __FUNCTION__); last_warning = jiffies; } -while (ret ==0 ) { +while (!ret) {yield (); ret =kmem_cache_alloc (jbd2_journal_head_cache,GFP_NOFS ); }
fs/jbd2/revoke.c +2 -2
@@ -174,13 +174,13 @@ int __init jbd2_journal_init_revoke_caches(void)0 ,SLAB_HWCACHE_ALIGN |SLAB_TEMPORARY , NULL); -if (jbd2_revoke_record_cache ==0 ) +if (!jbd2_revoke_record_cache)return -ENOMEM ; jbd2_revoke_table_cache =kmem_cache_create ("jbd2_revoke_table" ,sizeof (struct jbd2_revoke_table_s ),0 ,SLAB_TEMPORARY ,NULL ); -if (jbd2_revoke_table_cache ==0 ) { +if (!jbd2_revoke_table_cache) {kmem_cache_destroy (jbd2_revoke_record_cache); jbd2_revoke_record_cache =NULL ;return -ENOMEM ;
Signature · 1 line
1.5.4.rc5.1138.g2602