On Wed, 24 Mar 2010 21:32:39 +0800, jing zhang <zj.barak@xxxxxxxxx> wrote: > From: Jing Zhang <zj.barak@xxxxxxxxx> > > Date: Wed Mar 24 21:30:22 2010 > > There may exist fast path for merge if merge-able. > > Cc: Theodore Ts'o <tytso@xxxxxxx> > Cc: Andreas Dilger <adilger@xxxxxxx> > Cc: Dave Kleikamp <shaggy@xxxxxxxxxxxxxxxxxx> > Signed-off-by: Jing Zhang <zj.barak@xxxxxxxxx> > > --- > > --- linux-2.6.32/fs/ext4/mballoc.c 2009-12-03 11:51:22.000000000 +0800 > +++ ext4_mm_leak/mballoc7.c 2010-03-24 21:27:24.000000000 +0800 > @@ -4385,6 +4385,24 @@ ext4_mb_free_metadata(handle_t *handle, > } > } > > + if (parent) { > + /* let's try fast path */ > + entry = rb_entry(parent, struct ext4_free_data, node); > + if (n == &parent->rb_left) { > + if (can_merge(new_entry, entry)) { > + entry->start_blk = new_entry->start_blk; > + entry->count += new_entry->count; > + /* and info the caller that new_entry is > + * not used yet. > + */ > + return 0; return 0 on success so you may want -1 here > + } > + } > + else if (can_merge(entry, new_entry)) { > + entry->count += new_entry->count; > + return 0; > + } > + } > rb_link_node(new_node, parent, n); > rb_insert_color(new_node, &db->bb_free_root); > -- -aneesh -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html