On Mon, 2007-09-17 at 15:01 -0700, Badari Pulavarty wrote:Here is the incremental small cleanup patch. Remove kamlloc usages in jbd/jbd2 and consistently use jbd_kmalloc/jbd2_malloc. Signed-off-by: Mingming Cao <cmm@us.ibm.com> --- fs/jbd/journal.c | 8 +++++--- fs/jbd/revoke.c | 12 ++++++------ fs/jbd2/journal.c | 8 +++++--- fs/jbd2/revoke.c | 12 ++++++------ 4 files changed, 22 insertions(+), 18 deletions(-) Index: linux-2.6.23-rc6/fs/jbd/journal.c =================================================================== --- linux-2.6.23-rc6.orig/fs/jbd/journal.c 2007-09-17 14:32:16.000000000 -0700 +++ linux-2.6.23-rc6/fs/jbd/journal.c 2007-09-17 14:33:59.000000000 -0700 @@ -723,7 +723,8 @@ journal_t * journal_init_dev(struct bloc journal->j_blocksize = blocksize; n = journal->j_blocksize / sizeof(journal_block_tag_t); journal->j_wbufsize = n; - journal->j_wbuf = kmalloc(n * sizeof(struct buffer_head*), GFP_KERNEL); + journal->j_wbuf = jbd_kmalloc(n * sizeof(struct buffer_head*), + GFP_KERNEL); if (!journal->j_wbuf) { printk(KERN_ERR "%s: Cant allocate bhs for commit thread\n", __FUNCTION__); @@ -777,7 +778,8 @@ journal_t * journal_init_inode (struct i /* journal descriptor can store up to n blocks -bzzz */ n = journal->j_blocksize / sizeof(journal_block_tag_t); journal->j_wbufsize = n; - journal->j_wbuf = kmalloc(n * sizeof(struct buffer_head*), GFP_KERNEL); + journal->j_wbuf = jbd_kmalloc(n * sizeof(struct buffer_head*), + GFP_KERNEL); if (!journal->j_wbuf) { printk(KERN_ERR "%s: Cant allocate bhs for commit thread\n", __FUNCTION__); @@ -1157,7 +1159,7 @@ void journal_destroy(journal_t *journal) iput(journal->j_inode); if (journal->j_revoke) journal_destroy_revoke(journal); - kfree(journal->j_wbuf); + jbd_kfree(journal->j_wbuf); jbd_kfree(journal); } Index: linux-2.6.23-rc6/fs/jbd/revoke.c =================================================================== --- linux-2.6.23-rc6.orig/fs/jbd/revoke.c 2007-09-17 14:32:22.000000000 -0700 +++ linux-2.6.23-rc6/fs/jbd/revoke.c 2007-09-17 14:35:13.000000000 -0700 @@ -219,7 +219,7 @@ int journal_init_revoke(journal_t *journ journal->j_revoke->hash_shift = shift; journal->j_revoke->hash_table = - kmalloc(hash_size * sizeof(struct list_head), GFP_KERNEL); + jbd_kmalloc(hash_size * sizeof(struct list_head), GFP_KERNEL); if (!journal->j_revoke->hash_table) { kmem_cache_free(revoke_table_cache, journal->j_revoke_table[0]); journal->j_revoke = NULL; @@ -231,7 +231,7 @@ int journal_init_revoke(journal_t *journ journal->j_revoke_table[1] = kmem_cache_alloc(revoke_table_cache, GFP_KERNEL); if (!journal->j_revoke_table[1]) { - kfree(journal->j_revoke_table[0]->hash_table); + jbd_kfree(journal->j_revoke_table[0]->hash_table); kmem_cache_free(revoke_table_cache, journal->j_revoke_table[0]); return -ENOMEM; } @@ -246,9 +246,9 @@ int journal_init_revoke(journal_t *journ journal->j_revoke->hash_shift = shift; journal->j_revoke->hash_table = - kmalloc(hash_size * sizeof(struct list_head), GFP_KERNEL); + jbd_kmalloc(hash_size * sizeof(struct list_head), GFP_KERNEL); if (!journal->j_revoke->hash_table) { - kfree(journal->j_revoke_table[0]->hash_table); + jbd_kfree(journal->j_revoke_table[0]->hash_table); kmem_cache_free(revoke_table_cache, journal->j_revoke_table[0]); kmem_cache_free(revoke_table_cache, journal->j_revoke_table[1]); journal->j_revoke = NULL; @@ -280,7 +280,7 @@ void journal_destroy_revoke(journal_t *j J_ASSERT (list_empty(hash_list)); } - kfree(table->hash_table); + jbd_kfree(table->hash_table); kmem_cache_free(revoke_table_cache, table); journal->j_revoke = NULL; @@ -293,7 +293,7 @@ void journal_destroy_revoke(journal_t *j J_ASSERT (list_empty(hash_list)); } - kfree(table->hash_table); + jbd_kfree(table->hash_table); kmem_cache_free(revoke_table_cache, table); journal->j_revoke = NULL; } Index: linux-2.6.23-rc6/fs/jbd2/journal.c =================================================================== --- linux-2.6.23-rc6.orig/fs/jbd2/journal.c 2007-09-17 14:32:39.000000000 -0700 +++ linux-2.6.23-rc6/fs/jbd2/journal.c 2007-09-17 14:53:15.000000000 -0700 @@ -724,7 +724,8 @@ journal_t * jbd2_journal_init_dev(struct journal->j_blocksize = blocksize; n = journal->j_blocksize / sizeof(journal_block_tag_t); journal->j_wbufsize = n; - journal->j_wbuf = kmalloc(n * sizeof(struct buffer_head*), GFP_KERNEL); + journal->j_wbuf = jbd2_kmalloc(n * sizeof(struct buffer_head*), + GFP_KERNEL); if (!journal->j_wbuf) { printk(KERN_ERR "%s: Cant allocate bhs for commit thread\n", __FUNCTION__); @@ -778,7 +779,8 @@ journal_t * jbd2_journal_init_inode (str /* journal descriptor can store up to n blocks -bzzz */ n = journal->j_blocksize / sizeof(journal_block_tag_t); journal->j_wbufsize = n; - journal->j_wbuf = kmalloc(n * sizeof(struct buffer_head*), GFP_KERNEL); + journal->j_wbuf = jbd2_kmalloc(n * sizeof(struct buffer_head*), + GFP_KERNEL); if (!journal->j_wbuf) { printk(KERN_ERR "%s: Cant allocate bhs for commit thread\n", __FUNCTION__); @@ -1158,7 +1160,7 @@ void jbd2_journal_destroy(journal_t *jou iput(journal->j_inode); if (journal->j_revoke) jbd2_journal_destroy_revoke(journal); - kfree(journal->j_wbuf); + jbd2_kfree(journal->j_wbuf); jbd2_kfree(journal); } Index: linux-2.6.23-rc6/fs/jbd2/revoke.c =================================================================== --- linux-2.6.23-rc6.orig/fs/jbd2/revoke.c 2007-09-17 14:32:34.000000000 -0700 +++ linux-2.6.23-rc6/fs/jbd2/revoke.c 2007-09-17 14:55:35.000000000 -0700 @@ -220,7 +220,7 @@ int jbd2_journal_init_revoke(journal_t * journal->j_revoke->hash_shift = shift; journal->j_revoke->hash_table = - kmalloc(hash_size * sizeof(struct list_head), GFP_KERNEL); + jbd2_kmalloc(hash_size * sizeof(struct list_head), GFP_KERNEL); if (!journal->j_revoke->hash_table) { kmem_cache_free(jbd2_revoke_table_cache, journal->j_revoke_table[0]); journal->j_revoke = NULL; @@ -232,7 +232,7 @@ int jbd2_journal_init_revoke(journal_t * journal->j_revoke_table[1] = kmem_cache_alloc(jbd2_revoke_table_cache, GFP_KERNEL); if (!journal->j_revoke_table[1]) { - kfree(journal->j_revoke_table[0]->hash_table); + jbd2_kfree(journal->j_revoke_table[0]->hash_table); kmem_cache_free(jbd2_revoke_table_cache, journal->j_revoke_table[0]); return -ENOMEM; } @@ -247,9 +247,9 @@ int jbd2_journal_init_revoke(journal_t * journal->j_revoke->hash_shift = shift; journal->j_revoke->hash_table = - kmalloc(hash_size * sizeof(struct list_head), GFP_KERNEL); + jbd2_kmalloc(hash_size * sizeof(struct list_head), GFP_KERNEL); if (!journal->j_revoke->hash_table) { - kfree(journal->j_revoke_table[0]->hash_table); + jbd2_kfree(journal->j_revoke_table[0]->hash_table); kmem_cache_free(jbd2_revoke_table_cache, journal->j_revoke_table[0]); kmem_cache_free(jbd2_revoke_table_cache, journal->j_revoke_table[1]); journal->j_revoke = NULL; @@ -281,7 +281,7 @@ void jbd2_journal_destroy_revoke(journal J_ASSERT (list_empty(hash_list)); } - kfree(table->hash_table); + jbd2_kfree(table->hash_table); kmem_cache_free(jbd2_revoke_table_cache, table); journal->j_revoke = NULL; @@ -294,7 +294,7 @@ void jbd2_journal_destroy_revoke(journal J_ASSERT (list_empty(hash_list)); } - kfree(table->hash_table); + jbd2_kfree(table->hash_table); kmem_cache_free(jbd2_revoke_table_cache, table); journal->j_revoke = NULL; } -
| Linus Torvalds | Linux 2.6.27-rc8 |
| Greg KH | [patch 00/71] 2.6.26-stable review |
| Dmitry Torokhov | 2.6.27-rc8+ - first impressions |
| Rafael J. Wysocki | [Bug #11215] INFO: possible recursive locking detected ps2 command |
git: | |
| Christian MICHON | Re: MinGW port - initial work uploaded |
| Luiz Fernando N. Capitulino | Libification project (SoC) |
| Linus Torvalds | People unaware of the importance of "git gc"? |
| Jakub Narebski | [RFC] Git User's Survey 2008 |
| Richard Stallman | Real men don't attack straw men |
| Tony Abernethy | Re: What is our ultimate goal?? |
| GVG GVG | ssh_exchange_identification: Connection closed by remote host |
| James Hartley | scp batch mode? |
| Ingo Molnar | Re: [TCP]: TCP_DEFER_ACCEPT causes leak sockets |
| Timo Teräs | Re: xfrm_state locking regression... |
| Ingo Molnar | Re: [bug] stuck localhost TCP connections, v2.6.26-rc3+ |
| Natalie Protasevich | [BUG] New Kernel Bugs |
