[<prev] [next>] [day] [month] [year] [list]
Message-Id: <200612072317.kB7NHE5C030908@shell0.pdx.osdl.net>
Date: Thu, 07 Dec 2006 15:17:14 -0800
From: akpm@...l.org
To: johann.lombardi@...l.net, alex@...sterfs.com,
linux-ext4@...r.kernel.org, mm-commits@...r.kernel.org
Subject: - ext4-fix-credit-calculation-in-ext4_ext_calc_credits_for_insert.patch removed from -mm tree
The patch titled
ext4: fix credit calculation in ext4_ext_calc_credits_for_insert
has been removed from the -mm tree. Its filename was
ext4-fix-credit-calculation-in-ext4_ext_calc_credits_for_insert.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: ext4: fix credit calculation in ext4_ext_calc_credits_for_insert
From: Johann Lombardi <johann.lombardi@...l.net>
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 <johann.lombardi@...l.net>
Signed-off-by: Alex Tomas <alex@...sterfs.com>
Cc: <linux-ext4@...r.kernel.org>
Signed-off-by: Andrew Morton <akpm@...l.org>
---
fs/ext4/extents.c | 7 ++++---
1 file 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
@@ -1531,16 +1531,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@...l.net are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists