diff options
| author | Mingming Cao | 2007-10-17 00:38:25 +0200 |
|---|---|---|
| committer | Theodore Ts'o | 2007-10-18 00:49:56 +0200 |
| commit | af1e76d6b3f37cb89d9192eaf83588adaf4728eb (patch) | |
| tree | 8b30dd421361a61c3f2e9c96bd574986b4e78c9e /fs/jbd2/commit.c | |
| parent | JBD: JBD slab allocation cleanups (diff) | |
| download | kernel-qcow2-linux-af1e76d6b3f37cb89d9192eaf83588adaf4728eb.tar.gz kernel-qcow2-linux-af1e76d6b3f37cb89d9192eaf83588adaf4728eb.tar.xz kernel-qcow2-linux-af1e76d6b3f37cb89d9192eaf83588adaf4728eb.zip | |
JBD2: jbd2 slab allocation cleanups
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>
Diffstat (limited to 'fs/jbd2/commit.c')
| -rw-r--r-- | fs/jbd2/commit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index c0f59d1b13dc..2cac34ac756a 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -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; } |