[PATCH] Manage jbd allocations from its own slabs
JBD currently allocates commit and frozen buffers from slabs. With CONFIG_SLAB_DEBUG, its possible for an allocation to cross the page boundary causing IO problems. https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=200127 So, instead of allocating these from regular slabs - manage allocation from its own slabs and disable slab debug for these slabs. [akpm@osdl.org: cleanups] Signed-off-by: Badari Pulavarty <pbadari@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:

committed by
Linus Torvalds

parent
4c4d50f7b3
commit
ea817398e6
@@ -666,8 +666,9 @@ repeat:
|
||||
if (!frozen_buffer) {
|
||||
JBUFFER_TRACE(jh, "allocate memory for buffer");
|
||||
jbd_unlock_bh_state(bh);
|
||||
frozen_buffer = jbd_kmalloc(jh2bh(jh)->b_size,
|
||||
GFP_NOFS);
|
||||
frozen_buffer =
|
||||
jbd_slab_alloc(jh2bh(jh)->b_size,
|
||||
GFP_NOFS);
|
||||
if (!frozen_buffer) {
|
||||
printk(KERN_EMERG
|
||||
"%s: OOM for frozen_buffer\n",
|
||||
@@ -879,7 +880,7 @@ int journal_get_undo_access(handle_t *handle, struct buffer_head *bh)
|
||||
|
||||
repeat:
|
||||
if (!jh->b_committed_data) {
|
||||
committed_data = jbd_kmalloc(jh2bh(jh)->b_size, GFP_NOFS);
|
||||
committed_data = jbd_slab_alloc(jh2bh(jh)->b_size, GFP_NOFS);
|
||||
if (!committed_data) {
|
||||
printk(KERN_EMERG "%s: No memory for committed data\n",
|
||||
__FUNCTION__);
|
||||
@@ -906,7 +907,7 @@ repeat:
|
||||
out:
|
||||
journal_put_journal_head(jh);
|
||||
if (unlikely(committed_data))
|
||||
kfree(committed_data);
|
||||
jbd_slab_free(committed_data, bh->b_size);
|
||||
return err;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user