From patchwork Wed Mar 24 13:32:39 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jing zhang X-Patchwork-Id: 48413 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 126F7B7CF0 for ; Thu, 25 Mar 2010 00:33:01 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755946Ab0CXNcm (ORCPT ); Wed, 24 Mar 2010 09:32:42 -0400 Received: from mail-yw0-f172.google.com ([209.85.211.172]:52580 "EHLO mail-yw0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756059Ab0CXNcl (ORCPT ); Wed, 24 Mar 2010 09:32:41 -0400 Received: by ywh2 with SMTP id 2so2852099ywh.33 for ; Wed, 24 Mar 2010 06:32:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:cc:content-type; bh=zkpMeNlu/9ncaZElHrPQ8cfkvT4CFQC0KFJ+8uvK84c=; b=Bj92QCE8s473Bfc8kapTWRAvDzF560hfVbXb9x5KH0I81pEm3IEOldXUkaPRpTfDOX 7q/nK/DT/DfNZtsg0NO+gHNtyHwEHgVEOV3RShcjN9duoA6/n6xVZHqJhitc8zuof89S wV5U1y3lXG3IS9oPLDYhd0VGZyoVzcUbw+uvY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:cc:content-type; b=uGos9B992Y6hhj/fVCd/+NQYN+53EugQeB0uUXwPsAwzIXBCEZshDI7P6TVCO7PsMJ H6VcrPVz5/6hoWd18ZDek9DONKbqrUJG9i8Wu64JXcgXKmZP0ycv1KOcsc01titPStmf mfGHdZXTLQquTv+B0G9nSwnlO8HiQ0LTcq2CE= MIME-Version: 1.0 Received: by 10.101.202.34 with SMTP id e34mr7130284anq.107.1269437559860; Wed, 24 Mar 2010 06:32:39 -0700 (PDT) Date: Wed, 24 Mar 2010 21:32:39 +0800 Message-ID: Subject: [PATCH] ext4: try fast merge operation in ext4_mb_free_metadata() From: jing zhang To: linux-ext4 Cc: "Theodore Ts'o" , Andreas Dilger , Dave Kleikamp Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Jing Zhang Date: Wed Mar 24 21:30:22 2010 There may exist fast path for merge if merge-able. Cc: Theodore Ts'o Cc: Andreas Dilger Cc: Dave Kleikamp Signed-off-by: Jing Zhang --- the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 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; + } + } + 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); -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in