iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JBD2: jbd2 slab allocation cleanups

Browse Source 
JBD2: Replace slab allocations with page allocations

JBD2 allocate memory for committed_data and frozen_data from slab. However
JBD2 should not pass slab pages down to the block layer. Use page allocator
pages instead. This will also prepare JBD for the large blocksize patchset.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
This commit is contained in:
Mingming Cao
2007-10-16 18:38:25 -04:00
committed by Theodore Ts'o
parent c089d490df
commit af1e76d6b3
4 changed files with 27 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/jbd2/commit.c
View File

@@ -384,7 +384,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
struct buffer_head *bh = jh2bh(jh);
jbd_lock_bh_state(bh);
jbd2_slab_free(jh->b_committed_data, bh->b_size);
jbd2_free(jh->b_committed_data, bh->b_size);
jh->b_committed_data = NULL;
jbd_unlock_bh_state(bh);
}
@@ -801,14 +801,14 @@ restart_loop:
* Otherwise, we can just throw away the frozen data now.
*/
if (jh->b_committed_data) {
jbd2_slab_free(jh->b_committed_data, bh->b_size);
jbd2_free(jh->b_committed_data, bh->b_size);
jh->b_committed_data = NULL;
if (jh->b_frozen_data) {
jh->b_committed_data = jh->b_frozen_data;
jh->b_frozen_data = NULL;
}
} else if (jh->b_frozen_data) {
jbd2_slab_free(jh->b_frozen_data, bh->b_size);
jbd2_free(jh->b_frozen_data, bh->b_size);
jh->b_frozen_data = NULL;
}