From: akpm@osdl.org Subject: + ext4-fix-credit-calculation-in-ext4_ext_calc_credits_for_insert.patch added to -mm tree Date: Mon, 04 Dec 2006 12:51:42 -0800 Message-ID: <200612042051.kB4Kpggi003065@shell0.pdx.osdl.net> Cc: johann.lombardi@bull.net, alex@clusterfs.com, linux-ext4@vger.kernel.org Return-path: Received: from smtp.osdl.org ([65.172.181.25]:45767 "EHLO smtp.osdl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967180AbWLDUvv (ORCPT ); Mon, 4 Dec 2006 15:51:51 -0500 To: mm-commits@vger.kernel.org Sender: linux-ext4-owner@vger.kernel.org List-Id: linux-ext4.vger.kernel.org The patch titled ext4: fix credit calculation in ext4_ext_calc_credits_for_insert has been added to the -mm tree. Its filename is ext4-fix-credit-calculation-in-ext4_ext_calc_credits_for_insert.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: ext4: fix credit calculation in ext4_ext_calc_credits_for_insert From: Johann Lombardi Fix a nit in ext4_ext_calc_credits_for_insert(). Besides, credits for the new root are already added in the index split accounting. Signed-off-by: Johann Lombardi Signed-off-by: Alex Tomas Cc: Signed-off-by: Andrew Morton --- fs/ext4/extents.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff -puN fs/ext4/extents.c~ext4-fix-credit-calculation-in-ext4_ext_calc_credits_for_insert fs/ext4/extents.c --- a/fs/ext4/extents.c~ext4-fix-credit-calculation-in-ext4_ext_calc_credits_for_insert +++ a/fs/ext4/extents.c @@ -1534,16 +1534,17 @@ int inline ext4_ext_calc_credits_for_ins /* * tree can be full, so it would need to grow in depth: - * allocation + old root + new root + * we need one credit to modify old root, credits for + * new root will be added in split accounting */ - needed += 2 + 1 + 1; + needed += 1; /* * Index split can happen, we would need: * allocate intermediate indexes (bitmap + group) * + change two blocks at each level, but root (already included) */ - needed = (depth * 2) + (depth * 2); + needed += (depth * 2) + (depth * 2); /* any allocation modifies superblock */ needed += 1; _ Patches currently in -mm which might be from johann.lombardi@bull.net are ext4-fix-credit-calculation-in-ext4_ext_calc_credits_for_insert.patch