diff --git a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.18-vanilla.patch b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.18-vanilla.patch
index 7bc712e236d34c05e00cafb99c2e7f68959d3abc..cacaf0935e8e8f80711cf50653d6f20358455fd1 100644
--- a/ldiskfs/kernel_patches/patches/ext3-extents-2.6.18-vanilla.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-extents-2.6.18-vanilla.patch
@@ -1,12 +1,30 @@
-Index: linux-stage/fs/ext3/extents.c
+Index: linux-2.6.18.8/fs/ext3/dir.c
+===================================================================
+--- linux-2.6.18.8.orig/fs/ext3/dir.c 2007-02-24 00:52:30.000000000 +0100
++++ linux-2.6.18.8/fs/ext3/dir.c 2007-07-17 09:18:14.000000000 +0200
+@@ -131,8 +131,7 @@ static int ext3_readdir(struct file * fi
+ struct buffer_head *bh = NULL;
+
+ map_bh.b_state = 0;
+- err = ext3_get_blocks_handle(NULL, inode, blk, 1,
+- &map_bh, 0, 0);
++ err = ext3_get_blocks_wrap(NULL, inode, blk, 1, &map_bh, 0, 0);
+ if (err > 0) {
+ page_cache_readahead(sb->s_bdev->bd_inode->i_mapping,
+ &filp->f_ra,
+Index: linux-2.6.18.8/fs/ext3/extents.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-stage/fs/ext3/extents.c 2006-07-16 14:10:21.000000000 +0800
-@@ -0,0 +1,2359 @@
++++ linux-2.6.18.8/fs/ext3/extents.c 2007-07-17 11:08:59.000000000 +0200
+@@ -0,0 +1,2272 @@
+/*
-+ * Copyright(c) 2003, 2004, 2005, Cluster File Systems, Inc, info@clusterfs.com
++ * Copyright (c) 2003-2006, Cluster File Systems, Inc, info@clusterfs.com
+ * Written by Alex Tomas <alex@clusterfs.com>
+ *
++ * Architecture independence:
++ * Copyright (c) 2005, Bull S.A.
++ * Written by Pierre Peiffer <pierre.peiffer@bull.net>
++ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
@@ -25,13 +43,9 @@ Index: linux-stage/fs/ext3/extents.c
+ * Extents support for EXT3
+ *
+ * TODO:
-+ * - ext3_ext_walk_space() sould not use ext3_ext_find_extent()
-+ * - ext3_ext_calc_credits() could take 'mergable' into account
+ * - ext3*_error() should be used in some situations
-+ * - find_goal() [to be tested and improved]
++ * - analyze all BUG()/BUG_ON(), use -EIO where appropriate
+ * - smart tree reduction
-+ * - arch-independence
-+ * common on-disk format for big/little-endian arch
+ */
+
+#include <linux/module.h>
@@ -49,26 +63,6 @@ Index: linux-stage/fs/ext3/extents.c
+#include <asm/uaccess.h>
+
+
-+static inline int ext3_ext_check_header(struct ext3_extent_header *eh)
-+{
-+ if (eh->eh_magic != EXT3_EXT_MAGIC) {
-+ printk(KERN_ERR "EXT3-fs: invalid magic = 0x%x\n",
-+ (unsigned)eh->eh_magic);
-+ return -EIO;
-+ }
-+ if (eh->eh_max == 0) {
-+ printk(KERN_ERR "EXT3-fs: invalid eh_max = %u\n",
-+ (unsigned)eh->eh_max);
-+ return -EIO;
-+ }
-+ if (eh->eh_entries > eh->eh_max) {
-+ printk(KERN_ERR "EXT3-fs: invalid eh_entries = %u\n",
-+ (unsigned)eh->eh_entries);
-+ return -EIO;
-+ }
-+ return 0;
-+}
-+
+static handle_t *ext3_ext_journal_restart(handle_t *handle, int needed)
+{
+ int err;
@@ -78,26 +72,8 @@ Index: linux-stage/fs/ext3/extents.c
+ if (!ext3_journal_extend(handle, needed))
+ return handle;
+ err = ext3_journal_restart(handle, needed);
-+
-+ return handle;
-+}
-+
-+static int inline
-+ext3_ext_get_access_for_root(handle_t *h, struct ext3_extents_tree *tree)
-+{
-+ if (tree->ops->get_write_access)
-+ return tree->ops->get_write_access(h,tree->buffer);
-+ else
-+ return 0;
-+}
+
-+static int inline
-+ext3_ext_mark_root_dirty(handle_t *h, struct ext3_extents_tree *tree)
-+{
-+ if (tree->ops->mark_buffer_dirty)
-+ return tree->ops->mark_buffer_dirty(h,tree->buffer);
-+ else
-+ return 0;
++ return handle;
+}
+
+/*
@@ -105,20 +81,16 @@ Index: linux-stage/fs/ext3/extents.c
+ * - EROFS
+ * - ENOMEM
+ */
-+static int ext3_ext_get_access(handle_t *handle,
-+ struct ext3_extents_tree *tree,
-+ struct ext3_ext_path *path)
++static int ext3_ext_get_access(handle_t *handle, struct inode *inode,
++ struct ext3_ext_path *path)
+{
-+ int err;
-+
+ if (path->p_bh) {
+ /* path points to block */
-+ err = ext3_journal_get_write_access(handle, path->p_bh);
-+ } else {
-+ /* path points to leaf/index in inode body */
-+ err = ext3_ext_get_access_for_root(handle, tree);
++ return ext3_journal_get_write_access(handle, path->p_bh);
+ }
-+ return err;
++ /* path points to leaf/index in inode body */
++ /* we use in-core data, no need to protect them */
++ return 0;
+}
+
+/*
@@ -127,138 +99,212 @@ Index: linux-stage/fs/ext3/extents.c
+ * - ENOMEM
+ * - EIO
+ */
-+static int ext3_ext_dirty(handle_t *handle, struct ext3_extents_tree *tree,
-+ struct ext3_ext_path *path)
++static int ext3_ext_dirty(handle_t *handle, struct inode *inode,
++ struct ext3_ext_path *path)
+{
+ int err;
+ if (path->p_bh) {
+ /* path points to block */
-+ err =ext3_journal_dirty_metadata(handle, path->p_bh);
++ err = ext3_journal_dirty_metadata(handle, path->p_bh);
+ } else {
+ /* path points to leaf/index in inode body */
-+ err = ext3_ext_mark_root_dirty(handle, tree);
++ err = ext3_mark_inode_dirty(handle, inode);
+ }
+ return err;
+}
+
-+static int inline
-+ext3_ext_new_block(handle_t *handle, struct ext3_extents_tree *tree,
-+ struct ext3_ext_path *path, struct ext3_extent *ex,
-+ int *err)
++static int ext3_ext_find_goal(struct inode *inode,
++ struct ext3_ext_path *path,
++ unsigned long block)
+{
-+ int goal, depth, newblock;
-+ struct inode *inode;
++ struct ext3_inode_info *ei = EXT3_I(inode);
++ unsigned long bg_start;
++ unsigned long colour;
++ int depth;
++
++ if (path) {
++ struct ext3_extent *ex;
++ depth = path->p_depth;
+
-+ EXT_ASSERT(tree);
-+ if (tree->ops->new_block)
-+ return tree->ops->new_block(handle, tree, path, ex, err);
++ /* try to predict block placement */
++ if ((ex = path[depth].p_ext))
++ return le32_to_cpu(ex->ee_start)
++ + (block - le32_to_cpu(ex->ee_block));
+
-+ inode = tree->inode;
-+ depth = EXT_DEPTH(tree);
-+ if (path && depth > 0) {
-+ goal = path[depth-1].p_block;
-+ } else {
-+ struct ext3_inode_info *ei = EXT3_I(inode);
-+ unsigned long bg_start;
-+ unsigned long colour;
-+
-+ bg_start = (ei->i_block_group *
-+ EXT3_BLOCKS_PER_GROUP(inode->i_sb)) +
-+ le32_to_cpu(EXT3_SB(inode->i_sb)->s_es->s_first_data_block);
-+ colour = (current->pid % 16) *
-+ (EXT3_BLOCKS_PER_GROUP(inode->i_sb) / 16);
-+ goal = bg_start + colour;
++ /* it looks index is empty
++ * try to find starting from index itself */
++ if (path[depth].p_bh)
++ return path[depth].p_bh->b_blocknr;
+ }
+
-+ newblock = ext3_new_block(handle, inode, goal, err);
-+ return newblock;
++ /* OK. use inode's group */
++ bg_start = (ei->i_block_group * EXT3_BLOCKS_PER_GROUP(inode->i_sb)) +
++ le32_to_cpu(EXT3_SB(inode->i_sb)->s_es->s_first_data_block);
++ colour = (current->pid % 16) *
++ (EXT3_BLOCKS_PER_GROUP(inode->i_sb) / 16);
++ return bg_start + colour + block;
+}
+
-+static inline void ext3_ext_tree_changed(struct ext3_extents_tree *tree)
++static int
++ext3_ext_new_block(handle_t *handle, struct inode *inode,
++ struct ext3_ext_path *path,
++ struct ext3_extent *ex, int *err)
+{
-+ struct ext3_extent_header *neh = EXT_ROOT_HDR(tree);
-+ neh->eh_generation = ((EXT_FLAGS(neh) & ~EXT_FLAGS_CLR_UNKNOWN) << 24) |
-+ (EXT_HDR_GEN(neh) + 1);
++ int goal, newblock;
++
++ goal = ext3_ext_find_goal(inode, path, le32_to_cpu(ex->ee_block));
++ newblock = ext3_new_block(handle, inode, goal, err);
++ return newblock;
+}
+
-+static inline int ext3_ext_space_block(struct ext3_extents_tree *tree)
++static inline int ext3_ext_space_block(struct inode *inode)
+{
+ int size;
+
-+ size = (tree->inode->i_sb->s_blocksize -
-+ sizeof(struct ext3_extent_header)) /
-+ sizeof(struct ext3_extent);
++ size = (inode->i_sb->s_blocksize - sizeof(struct ext3_extent_header))
++ / sizeof(struct ext3_extent);
+#ifdef AGRESSIVE_TEST
-+ size = 6;
++ if (size > 6)
++ size = 6;
+#endif
+ return size;
+}
+
-+static inline int ext3_ext_space_block_idx(struct ext3_extents_tree *tree)
++static inline int ext3_ext_space_block_idx(struct inode *inode)
+{
+ int size;
+
-+ size = (tree->inode->i_sb->s_blocksize -
-+ sizeof(struct ext3_extent_header)) /
-+ sizeof(struct ext3_extent_idx);
++ size = (inode->i_sb->s_blocksize - sizeof(struct ext3_extent_header))
++ / sizeof(struct ext3_extent_idx);
+#ifdef AGRESSIVE_TEST
-+ size = 5;
++ if (size > 5)
++ size = 5;
+#endif
+ return size;
+}
+
-+static inline int ext3_ext_space_root(struct ext3_extents_tree *tree)
++static inline int ext3_ext_space_root(struct inode *inode)
+{
+ int size;
+
-+ size = (tree->buffer_len - sizeof(struct ext3_extent_header)) /
-+ sizeof(struct ext3_extent);
++ size = sizeof(EXT3_I(inode)->i_data);
++ size -= sizeof(struct ext3_extent_header);
++ size /= sizeof(struct ext3_extent);
+#ifdef AGRESSIVE_TEST
-+ size = 3;
++ if (size > 3)
++ size = 3;
+#endif
+ return size;
+}
+
-+static inline int ext3_ext_space_root_idx(struct ext3_extents_tree *tree)
++static inline int ext3_ext_space_root_idx(struct inode *inode)
+{
+ int size;
+
-+ size = (tree->buffer_len - sizeof(struct ext3_extent_header)) /
-+ sizeof(struct ext3_extent_idx);
++ size = sizeof(EXT3_I(inode)->i_data);
++ size -= sizeof(struct ext3_extent_header);
++ size /= sizeof(struct ext3_extent_idx);
+#ifdef AGRESSIVE_TEST
-+ size = 4;
++ if (size > 4)
++ size = 4;
+#endif
+ return size;
+}
+
-+static void ext3_ext_show_path(struct ext3_extents_tree *tree,
-+ struct ext3_ext_path *path)
++static inline int
++ext3_ext_max_entries(struct inode *inode, int depth)
++{
++ int max;
++
++ if (depth == ext_depth(inode)) {
++ if (depth == 0)
++ max = ext3_ext_space_root(inode);
++ else
++ max = ext3_ext_space_root_idx(inode);
++ } else {
++ if (depth == 0)
++ max = ext3_ext_space_block(inode);
++ else
++ max = ext3_ext_space_block_idx(inode);
++ }
++
++ return max;
++}
++
++static int __ext3_ext_check_header(const char *function, struct inode *inode,
++ struct ext3_extent_header *eh,
++ int depth)
+{
++ const char *error_msg = NULL;
++ int max = 0;
++
++ if (unlikely(eh->eh_magic != cpu_to_le16(EXT3_EXT_MAGIC))) {
++ error_msg = "invalid magic";
++ goto corrupted;
++ }
++ if (unlikely(le16_to_cpu(eh->eh_depth) != depth)) {
++ error_msg = "unexpected eh_depth";
++ goto corrupted;
++ }
++ if (unlikely(eh->eh_max == 0)) {
++ error_msg = "invalid eh_max";
++ goto corrupted;
++ }
++ max = ext3_ext_max_entries(inode, depth);
++#ifdef AGRESSIVE_TEST
++ if (eh->eh_max > 3) {
++ /* inode probably got extent without defining AGRESSIVE_TEST */
++ max = eh->eh_max;
++ }
++#endif
++ if (unlikely(le16_to_cpu(eh->eh_max) > max)) {
++ error_msg = "too large eh_max";
++ goto corrupted;
++ }
++ if (unlikely(le16_to_cpu(eh->eh_entries) > le16_to_cpu(eh->eh_max))) {
++ error_msg = "invalid eh_entries";
++ goto corrupted;
++ }
++ return 0;
++
++corrupted:
++ ext3_error(inode->i_sb, function,
++ "bad header in inode #%lu: %s - magic %x, "
++ "entries %u, max %u(%u), depth %u(%u)",
++ inode->i_ino, error_msg, le16_to_cpu(eh->eh_magic),
++ le16_to_cpu(eh->eh_entries), le16_to_cpu(eh->eh_max),
++ max, le16_to_cpu(eh->eh_depth), depth);
++
++ return -EIO;
++}
++
++#define ext3_ext_check_header(inode,eh,depth) \
++ __ext3_ext_check_header(__FUNCTION__,inode,eh,depth)
++
+#ifdef EXT_DEBUG
++static void ext3_ext_show_path(struct inode *inode, struct ext3_ext_path *path)
++{
+ int k, l = path->p_depth;
+
-+ ext_debug(tree, "path:");
++ ext_debug(inode, "path:");
+ for (k = 0; k <= l; k++, path++) {
+ if (path->p_idx) {
-+ ext_debug(tree, " %d->%d", path->p_idx->ei_block,
-+ path->p_idx->ei_leaf);
++ ext_debug(inode, " %d->%d", le32_to_cpu(path->p_idx->ei_block),
++ le32_to_cpu(path->p_idx->ei_leaf));
+ } else if (path->p_ext) {
-+ ext_debug(tree, " %d:%d:%d",
-+ path->p_ext->ee_block,
-+ path->p_ext->ee_len,
-+ path->p_ext->ee_start);
++ ext_debug(inode, " %d:%d:%d",
++ le32_to_cpu(path->p_ext->ee_block),
++ le16_to_cpu(path->p_ext->ee_len),
++ le32_to_cpu(path->p_ext->ee_start));
+ } else
-+ ext_debug(tree, " []");
++ ext_debug(inode, " []");
+ }
-+ ext_debug(tree, "\n");
-+#endif
++ ext_debug(inode, "\n");
+}
+
-+static void ext3_ext_show_leaf(struct ext3_extents_tree *tree,
-+ struct ext3_ext_path *path)
++static void ext3_ext_show_leaf(struct inode *inode, struct ext3_ext_path *path)
+{
-+#ifdef EXT_DEBUG
-+ int depth = EXT_DEPTH(tree);
++ int depth = ext_depth(inode);
+ struct ext3_extent_header *eh;
+ struct ext3_extent *ex;
+ int i;
@@ -269,103 +315,94 @@ Index: linux-stage/fs/ext3/extents.c
+ eh = path[depth].p_hdr;
+ ex = EXT_FIRST_EXTENT(eh);
+
-+ for (i = 0; i < eh->eh_entries; i++, ex++) {
-+ ext_debug(tree, "%d:%d:%d ",
-+ ex->ee_block, ex->ee_len, ex->ee_start);
++ for (i = 0; i < le16_to_cpu(eh->eh_entries); i++, ex++) {
++ ext_debug(inode, "%d:%d:%d ", le32_to_cpu(ex->ee_block),
++ le16_to_cpu(ex->ee_len),
++ le32_to_cpu(ex->ee_start));
+ }
-+ ext_debug(tree, "\n");
-+#endif
++ ext_debug(inode, "\n");
+}
++#else
++#define ext3_ext_show_path(inode,path)
++#define ext3_ext_show_leaf(inode,path)
++#endif
+
+static void ext3_ext_drop_refs(struct ext3_ext_path *path)
+{
+ int depth = path->p_depth;
+ int i;
+
-+ for (i = 0; i <= depth; i++, path++) {
++ for (i = 0; i <= depth; i++, path++)
+ if (path->p_bh) {
+ brelse(path->p_bh);
+ path->p_bh = NULL;
+ }
-+ }
+}
+
+/*
+ * binary search for closest index by given block
++ * the header must be checked before calling this
+ */
-+static inline void
-+ext3_ext_binsearch_idx(struct ext3_extents_tree *tree,
-+ struct ext3_ext_path *path, int block)
++static void
++ext3_ext_binsearch_idx(struct inode *inode, struct ext3_ext_path *path, int block)
+{
+ struct ext3_extent_header *eh = path->p_hdr;
-+ struct ext3_extent_idx *ix;
-+ int l = 0, k, r;
++ struct ext3_extent_idx *r, *l, *m;
+
-+ EXT_ASSERT(eh->eh_magic == EXT3_EXT_MAGIC);
-+ EXT_ASSERT(eh->eh_entries <= eh->eh_max);
-+ EXT_ASSERT(eh->eh_entries > 0);
++ ext_debug(inode, "binsearch for %d(idx): ", block);
+
-+ ext_debug(tree, "binsearch for %d(idx): ", block);
-+
-+ path->p_idx = ix = EXT_FIRST_INDEX(eh);
-+
-+ r = k = eh->eh_entries;
-+ while (k > 1) {
-+ k = (r - l) / 2;
-+ if (block < ix[l + k].ei_block)
-+ r -= k;
++ l = EXT_FIRST_INDEX(eh) + 1;
++ r = EXT_FIRST_INDEX(eh) + le16_to_cpu(eh->eh_entries) - 1;
++ while (l <= r) {
++ m = l + (r - l) / 2;
++ if (block < le32_to_cpu(m->ei_block))
++ r = m - 1;
+ else
-+ l += k;
-+ ext_debug(tree, "%d:%d:%d ", k, l, r);
++ l = m + 1;
++ ext_debug(inode, "%p(%u):%p(%u):%p(%u) ", l, l->ei_block,
++ m, m->ei_block, r, r->ei_block);
+ }
+
-+ ix += l;
-+ path->p_idx = ix;
-+ ext_debug(tree," -> %d->%d ",path->p_idx->ei_block,path->p_idx->ei_leaf);
-+
-+ while (l++ < r) {
-+ if (block < ix->ei_block)
-+ break;
-+ path->p_idx = ix++;
-+ }
-+ ext_debug(tree, " -> %d->%d\n", path->p_idx->ei_block,
-+ path->p_idx->ei_leaf);
++ path->p_idx = l - 1;
++ ext_debug(inode, " -> %d->%d ", le32_to_cpu(path->p_idx->ei_block),
++ le32_to_cpu(path->p_idx->ei_leaf));
+
-+#ifdef CHECK_BINSEARCH
++#ifdef CHECK_BINSEARCH
+ {
-+ struct ext3_extent_idx *chix;
++ struct ext3_extent_idx *chix, *ix;
++ int k;
+
+ chix = ix = EXT_FIRST_INDEX(eh);
-+ for (k = 0; k < eh->eh_entries; k++, ix++) {
-+ if (k != 0 && ix->ei_block <= ix[-1].ei_block) {
++ for (k = 0; k < le16_to_cpu(eh->eh_entries); k++, ix++) {
++ if (k != 0 &&
++ le32_to_cpu(ix->ei_block) <= le32_to_cpu(ix[-1].ei_block)) {
+ printk("k=%d, ix=0x%p, first=0x%p\n", k,
-+ ix, EXT_FIRST_INDEX(eh));
++ ix, EXT_FIRST_INDEX(eh));
+ printk("%u <= %u\n",
-+ ix->ei_block,ix[-1].ei_block);
++ le32_to_cpu(ix->ei_block),
++ le32_to_cpu(ix[-1].ei_block));
+ }
-+ EXT_ASSERT(k == 0 || ix->ei_block > ix[-1].ei_block);
-+ if (block < ix->ei_block)
++ BUG_ON(k && le32_to_cpu(ix->ei_block)
++ <= le32_to_cpu(ix[-1].ei_block));
++ if (block < le32_to_cpu(ix->ei_block))
+ break;
+ chix = ix;
+ }
-+ EXT_ASSERT(chix == path->p_idx);
++ BUG_ON(chix != path->p_idx);
+ }
+#endif
++
+}
+
+/*
+ * binary search for closest extent by given block
++ * the header must be checked before calling this
+ */
-+static inline void
-+ext3_ext_binsearch(struct ext3_extents_tree *tree,
-+ struct ext3_ext_path *path, int block)
++static void
++ext3_ext_binsearch(struct inode *inode, struct ext3_ext_path *path, int block)
+{
+ struct ext3_extent_header *eh = path->p_hdr;
-+ struct ext3_extent *ex;
-+ int l = 0, k, r;
-+
-+ EXT_ASSERT(eh->eh_magic == EXT3_EXT_MAGIC);
-+ EXT_ASSERT(eh->eh_entries <= eh->eh_max);
++ struct ext3_extent *r, *l, *m;
+
+ if (eh->eh_entries == 0) {
+ /*
@@ -374,122 +411,106 @@ Index: linux-stage/fs/ext3/extents.c
+ */
+ return;
+ }
-+
-+ ext_debug(tree, "binsearch for %d: ", block);
+
-+ path->p_ext = ex = EXT_FIRST_EXTENT(eh);
++ ext_debug(inode, "binsearch for %d: ", block);
+
-+ r = k = eh->eh_entries;
-+ while (k > 1) {
-+ k = (r - l) / 2;
-+ if (block < ex[l + k].ee_block)
-+ r -= k;
++ l = EXT_FIRST_EXTENT(eh) + 1;
++ r = EXT_FIRST_EXTENT(eh) + le16_to_cpu(eh->eh_entries) - 1;
++
++ while (l <= r) {
++ m = l + (r - l) / 2;
++ if (block < le32_to_cpu(m->ee_block))
++ r = m - 1;
+ else
-+ l += k;
-+ ext_debug(tree, "%d:%d:%d ", k, l, r);
++ l = m + 1;
++ ext_debug(inode, "%p(%u):%p(%u):%p(%u) ", l, l->ee_block,
++ m, m->ee_block, r, r->ee_block);
+ }
+
-+ ex += l;
-+ path->p_ext = ex;
-+ ext_debug(tree, " -> %d:%d:%d ", path->p_ext->ee_block,
-+ path->p_ext->ee_start, path->p_ext->ee_len);
-+
-+ while (l++ < r) {
-+ if (block < ex->ee_block)
-+ break;
-+ path->p_ext = ex++;
-+ }
-+ ext_debug(tree, " -> %d:%d:%d\n", path->p_ext->ee_block,
-+ path->p_ext->ee_start, path->p_ext->ee_len);
++ path->p_ext = l - 1;
++ ext_debug(inode, " -> %d:%d:%d ",
++ le32_to_cpu(path->p_ext->ee_block),
++ le32_to_cpu(path->p_ext->ee_start),
++ le16_to_cpu(path->p_ext->ee_len));
+
-+#ifdef CHECK_BINSEARCH
++#ifdef CHECK_BINSEARCH
+ {
-+ struct ext3_extent *chex;
++ struct ext3_extent *chex, *ex;
++ int k;
+
+ chex = ex = EXT_FIRST_EXTENT(eh);
-+ for (k = 0; k < eh->eh_entries; k++, ex++) {
-+ EXT_ASSERT(k == 0 || ex->ee_block > ex[-1].ee_block);
-+ if (block < ex->ee_block)
++ for (k = 0; k < le16_to_cpu(eh->eh_entries); k++, ex++) {
++ BUG_ON(k && le32_to_cpu(ex->ee_block)
++ <= le32_to_cpu(ex[-1].ee_block));
++ if (block < le32_to_cpu(ex->ee_block))
+ break;
+ chex = ex;
+ }
-+ EXT_ASSERT(chex == path->p_ext);
++ BUG_ON(chex != path->p_ext);
+ }
+#endif
++
+}
+
-+int ext3_extent_tree_init(handle_t *handle, struct ext3_extents_tree *tree)
++int ext3_ext_tree_init(handle_t *handle, struct inode *inode)
+{
+ struct ext3_extent_header *eh;
+
-+ BUG_ON(tree->buffer_len == 0);
-+ ext3_ext_get_access_for_root(handle, tree);
-+ eh = EXT_ROOT_HDR(tree);
++ eh = ext_inode_hdr(inode);
+ eh->eh_depth = 0;
+ eh->eh_entries = 0;
-+ eh->eh_magic = EXT3_EXT_MAGIC;
-+ eh->eh_max = ext3_ext_space_root(tree);
-+ ext3_ext_mark_root_dirty(handle, tree);
-+ ext3_ext_invalidate_cache(tree);
++ eh->eh_magic = cpu_to_le16(EXT3_EXT_MAGIC);
++ eh->eh_max = cpu_to_le16(ext3_ext_space_root(inode));
++ ext3_mark_inode_dirty(handle, inode);
++ ext3_ext_invalidate_cache(inode);
+ return 0;
+}
+
+struct ext3_ext_path *
-+ext3_ext_find_extent(struct ext3_extents_tree *tree, int block,
-+ struct ext3_ext_path *path)
++ext3_ext_find_extent(struct inode *inode, int block, struct ext3_ext_path *path)
+{
+ struct ext3_extent_header *eh;
+ struct buffer_head *bh;
-+ int depth, i, ppos = 0;
-+
-+ EXT_ASSERT(tree);
-+ EXT_ASSERT(tree->inode);
-+ EXT_ASSERT(tree->root);
++ short int depth, i, ppos = 0, alloc = 0;
+
-+ eh = EXT_ROOT_HDR(tree);
-+ EXT_ASSERT(eh);
-+ if (ext3_ext_check_header(eh)) {
-+ /* don't free previously allocated path
-+ * -- caller should take care */
-+ path = NULL;
-+ goto err;
-+ }
++ eh = ext_inode_hdr(inode);
++ i = depth = ext_depth(inode);
++ if (ext3_ext_check_header(inode, eh, depth))
++ return ERR_PTR(-EIO);
+
-+ i = depth = EXT_DEPTH(tree);
-+ EXT_ASSERT(eh->eh_max);
-+ EXT_ASSERT(eh->eh_magic == EXT3_EXT_MAGIC);
-+
+ /* account possible depth increase */
+ if (!path) {
+ path = kmalloc(sizeof(struct ext3_ext_path) * (depth + 2),
-+ GFP_NOFS);
++ GFP_NOFS);
+ if (!path)
+ return ERR_PTR(-ENOMEM);
++ alloc = 1;
+ }
+ memset(path, 0, sizeof(struct ext3_ext_path) * (depth + 1));
+ path[0].p_hdr = eh;
+
+ /* walk through the tree */
+ while (i) {
-+ ext_debug(tree, "depth %d: num %d, max %d\n",
-+ ppos, eh->eh_entries, eh->eh_max);
-+ ext3_ext_binsearch_idx(tree, path + ppos, block);
-+ path[ppos].p_block = path[ppos].p_idx->ei_leaf;
++ ext_debug(inode, "depth %d: num %d, max %d\n",
++ ppos, le16_to_cpu(eh->eh_entries), le16_to_cpu(eh->eh_max));
++
++ ext3_ext_binsearch_idx(inode, path + ppos, block);
++ path[ppos].p_block = le32_to_cpu(path[ppos].p_idx->ei_leaf);
+ path[ppos].p_depth = i;
+ path[ppos].p_ext = NULL;
+
-+ bh = sb_bread(tree->inode->i_sb, path[ppos].p_block);
++ bh = sb_bread(inode->i_sb, path[ppos].p_block);
+ if (!bh)
+ goto err;
+
-+ eh = EXT_BLOCK_HDR(bh);
++ eh = ext_block_hdr(bh);
+ ppos++;
-+ EXT_ASSERT(ppos <= depth);
++ BUG_ON(ppos > depth);
+ path[ppos].p_bh = bh;
+ path[ppos].p_hdr = eh;
+ i--;
+
-+ if (ext3_ext_check_header(eh))
++ if (ext3_ext_check_header(inode, eh, i))
+ goto err;
+ }
+
@@ -498,22 +519,17 @@ Index: linux-stage/fs/ext3/extents.c
+ path[ppos].p_ext = NULL;
+ path[ppos].p_idx = NULL;
+
-+ if (ext3_ext_check_header(eh))
-+ goto err;
-+
+ /* find extent */
-+ ext3_ext_binsearch(tree, path + ppos, block);
++ ext3_ext_binsearch(inode, path + ppos, block);
+
-+ ext3_ext_show_path(tree, path);
++ ext3_ext_show_path(inode, path);
+
+ return path;
+
+err:
-+ printk(KERN_ERR "EXT3-fs: header is corrupted!\n");
-+ if (path) {
-+ ext3_ext_drop_refs(path);
++ ext3_ext_drop_refs(path);
++ if (alloc)
+ kfree(path);
-+ }
+ return ERR_PTR(-EIO);
+}
+
@@ -521,28 +537,27 @@ Index: linux-stage/fs/ext3/extents.c
+ * insert new index [logical;ptr] into the block at cupr
+ * it check where to insert: before curp or after curp
+ */
-+static int ext3_ext_insert_index(handle_t *handle,
-+ struct ext3_extents_tree *tree,
-+ struct ext3_ext_path *curp,
-+ int logical, int ptr)
++static int ext3_ext_insert_index(handle_t *handle, struct inode *inode,
++ struct ext3_ext_path *curp,
++ int logical, int ptr)
+{
+ struct ext3_extent_idx *ix;
+ int len, err;
+
-+ if ((err = ext3_ext_get_access(handle, tree, curp)))
++ if ((err = ext3_ext_get_access(handle, inode, curp)))
+ return err;
+
-+ EXT_ASSERT(logical != curp->p_idx->ei_block);
++ BUG_ON(logical == le32_to_cpu(curp->p_idx->ei_block));
+ len = EXT_MAX_INDEX(curp->p_hdr) - curp->p_idx;
-+ if (logical > curp->p_idx->ei_block) {
++ if (logical > le32_to_cpu(curp->p_idx->ei_block)) {
+ /* insert after */
+ if (curp->p_idx != EXT_LAST_INDEX(curp->p_hdr)) {
+ len = (len - 1) * sizeof(struct ext3_extent_idx);
+ len = len < 0 ? 0 : len;
-+ ext_debug(tree, "insert new index %d after: %d. "
-+ "move %d from 0x%p to 0x%p\n",
-+ logical, ptr, len,
-+ (curp->p_idx + 1), (curp->p_idx + 2));
++ ext_debug(inode, "insert new index %d after: %d. "
++ "move %d from 0x%p to 0x%p\n",
++ logical, ptr, len,
++ (curp->p_idx + 1), (curp->p_idx + 2));
+ memmove(curp->p_idx + 2, curp->p_idx + 1, len);
+ }
+ ix = curp->p_idx + 1;
@@ -550,24 +565,25 @@ Index: linux-stage/fs/ext3/extents.c
+ /* insert before */
+ len = len * sizeof(struct ext3_extent_idx);
+ len = len < 0 ? 0 : len;
-+ ext_debug(tree, "insert new index %d before: %d. "
-+ "move %d from 0x%p to 0x%p\n",
-+ logical, ptr, len,
-+ curp->p_idx, (curp->p_idx + 1));
++ ext_debug(inode, "insert new index %d before: %d. "
++ "move %d from 0x%p to 0x%p\n",
++ logical, ptr, len,
++ curp->p_idx, (curp->p_idx + 1));
+ memmove(curp->p_idx + 1, curp->p_idx, len);
+ ix = curp->p_idx;
+ }
+
-+ ix->ei_block = logical;
-+ ix->ei_leaf = ptr;
++ ix->ei_block = cpu_to_le32(logical);
++ ix->ei_leaf = cpu_to_le32(ptr);
+ ix->ei_leaf_hi = ix->ei_unused = 0;
-+ curp->p_hdr->eh_entries++;
++ curp->p_hdr->eh_entries = cpu_to_le16(le16_to_cpu(curp->p_hdr->eh_entries)+1);
+
-+ EXT_ASSERT(curp->p_hdr->eh_entries <= curp->p_hdr->eh_max);
-+ EXT_ASSERT(ix <= EXT_LAST_INDEX(curp->p_hdr));
++ BUG_ON(le16_to_cpu(curp->p_hdr->eh_entries)
++ > le16_to_cpu(curp->p_hdr->eh_max));
++ BUG_ON(ix > EXT_LAST_INDEX(curp->p_hdr));
+
-+ err = ext3_ext_dirty(handle, tree, curp);
-+ ext3_std_error(tree->inode->i_sb, err);
++ err = ext3_ext_dirty(handle, inode, curp);
++ ext3_std_error(inode->i_sb, err);
+
+ return err;
+}
@@ -581,39 +597,40 @@ Index: linux-stage/fs/ext3/extents.c
+ * into the newly allocated blocks
+ * - initialize subtree
+ */
-+static int ext3_ext_split(handle_t *handle, struct ext3_extents_tree *tree,
-+ struct ext3_ext_path *path,
-+ struct ext3_extent *newext, int at)
++static int ext3_ext_split(handle_t *handle, struct inode *inode,
++ struct ext3_ext_path *path,
++ struct ext3_extent *newext, int at)
+{
+ struct buffer_head *bh = NULL;
-+ int depth = EXT_DEPTH(tree);
++ int depth = ext_depth(inode);
+ struct ext3_extent_header *neh;
+ struct ext3_extent_idx *fidx;
+ struct ext3_extent *ex;
+ int i = at, k, m, a;
-+ unsigned long newblock, oldblock, border;
++ unsigned long newblock, oldblock;
++ __le32 border;
+ int *ablocks = NULL; /* array of allocated blocks */
+ int err = 0;
+
+ /* make decision: where to split? */
+ /* FIXME: now desicion is simplest: at current extent */
+
-+ /* if current leaf will be splitted, then we should use
++ /* if current leaf will be splitted, then we should use
+ * border from split point */
-+ EXT_ASSERT(path[depth].p_ext <= EXT_MAX_EXTENT(path[depth].p_hdr));
++ BUG_ON(path[depth].p_ext > EXT_MAX_EXTENT(path[depth].p_hdr));
+ if (path[depth].p_ext != EXT_MAX_EXTENT(path[depth].p_hdr)) {
+ border = path[depth].p_ext[1].ee_block;
-+ ext_debug(tree, "leaf will be splitted."
-+ " next leaf starts at %d\n",
-+ (int)border);
++ ext_debug(inode, "leaf will be splitted."
++ " next leaf starts at %d\n",
++ le32_to_cpu(border));
+ } else {
+ border = newext->ee_block;
-+ ext_debug(tree, "leaf will be added."
-+ " next leaf starts at %d\n",
-+ (int)border);
++ ext_debug(inode, "leaf will be added."
++ " next leaf starts at %d\n",
++ le32_to_cpu(border));
+ }
+
-+ /*
++ /*
+ * if error occurs, then we break processing
+ * and turn filesystem read-only. so, index won't
+ * be inserted and tree will be in consistent
@@ -631,9 +648,9 @@ Index: linux-stage/fs/ext3/extents.c
+ memset(ablocks, 0, sizeof(unsigned long) * depth);
+
+ /* allocate all needed blocks */
-+ ext_debug(tree, "allocate %d blocks for indexes/leaf\n", depth - at);
++ ext_debug(inode, "allocate %d blocks for indexes/leaf\n", depth - at);
+ for (a = 0; a < depth - at; a++) {
-+ newblock = ext3_ext_new_block(handle, tree, path, newext, &err);
++ newblock = ext3_ext_new_block(handle, inode, path, newext, &err);
+ if (newblock == 0)
+ goto cleanup;
+ ablocks[a] = newblock;
@@ -641,8 +658,8 @@ Index: linux-stage/fs/ext3/extents.c
+
+ /* initialize new leaf */
+ newblock = ablocks[--a];
-+ EXT_ASSERT(newblock);
-+ bh = sb_getblk(tree->inode->i_sb, newblock);
++ BUG_ON(newblock == 0);
++ bh = sb_getblk(inode->i_sb, newblock);
+ if (!bh) {
+ err = -EIO;
+ goto cleanup;
@@ -652,60 +669,68 @@ Index: linux-stage/fs/ext3/extents.c
+ if ((err = ext3_journal_get_create_access(handle, bh)))
+ goto cleanup;
+
-+ neh = EXT_BLOCK_HDR(bh);
++ neh = ext_block_hdr(bh);
+ neh->eh_entries = 0;
-+ neh->eh_max = ext3_ext_space_block(tree);
-+ neh->eh_magic = EXT3_EXT_MAGIC;
++ neh->eh_max = cpu_to_le16(ext3_ext_space_block(inode));
++ neh->eh_magic = cpu_to_le16(EXT3_EXT_MAGIC);
+ neh->eh_depth = 0;
+ ex = EXT_FIRST_EXTENT(neh);
+
+ /* move remain of path[depth] to the new leaf */
-+ EXT_ASSERT(path[depth].p_hdr->eh_entries == path[depth].p_hdr->eh_max);
++ BUG_ON(path[depth].p_hdr->eh_entries != path[depth].p_hdr->eh_max);
+ /* start copy from next extent */
+ /* TODO: we could do it by single memmove */
+ m = 0;
+ path[depth].p_ext++;
+ while (path[depth].p_ext <=
+ EXT_MAX_EXTENT(path[depth].p_hdr)) {
-+ ext_debug(tree, "move %d:%d:%d in new leaf %lu\n",
-+ path[depth].p_ext->ee_block,
-+ path[depth].p_ext->ee_start,
-+ path[depth].p_ext->ee_len,
-+ newblock);
-+ memmove(ex++, path[depth].p_ext++, sizeof(struct ext3_extent));
-+ neh->eh_entries++;
++ ext_debug(inode, "move %d:%d:%d in new leaf %lu\n",
++ le32_to_cpu(path[depth].p_ext->ee_block),
++ le32_to_cpu(path[depth].p_ext->ee_start),
++ le16_to_cpu(path[depth].p_ext->ee_len),
++ newblock);
++ /*memmove(ex++, path[depth].p_ext++,
++ sizeof(struct ext3_extent));
++ neh->eh_entries++;*/
++ path[depth].p_ext++;
+ m++;
+ }
++ if (m) {
++ memmove(ex, path[depth].p_ext-m, sizeof(struct ext3_extent)*m);
++ neh->eh_entries = cpu_to_le16(le16_to_cpu(neh->eh_entries)+m);
++ }
++
+ set_buffer_uptodate(bh);
+ unlock_buffer(bh);
+
+ if ((err = ext3_journal_dirty_metadata(handle, bh)))
-+ goto cleanup;
++ goto cleanup;
+ brelse(bh);
+ bh = NULL;
+
+ /* correct old leaf */
+ if (m) {
-+ if ((err = ext3_ext_get_access(handle, tree, path + depth)))
++ if ((err = ext3_ext_get_access(handle, inode, path + depth)))
+ goto cleanup;
-+ path[depth].p_hdr->eh_entries -= m;
-+ if ((err = ext3_ext_dirty(handle, tree, path + depth)))
++ path[depth].p_hdr->eh_entries =
++ cpu_to_le16(le16_to_cpu(path[depth].p_hdr->eh_entries)-m);
++ if ((err = ext3_ext_dirty(handle, inode, path + depth)))
+ goto cleanup;
-+
++
+ }
+
+ /* create intermediate indexes */
+ k = depth - at - 1;
-+ EXT_ASSERT(k >= 0);
++ BUG_ON(k < 0);
+ if (k)
-+ ext_debug(tree, "create %d intermediate indices\n", k);
++ ext_debug(inode, "create %d intermediate indices\n", k);
+ /* insert new index into current index block */
+ /* current depth stored in i var */
+ i = depth - 1;
+ while (k--) {
+ oldblock = newblock;
+ newblock = ablocks[--a];
-+ bh = sb_getblk(tree->inode->i_sb, newblock);
++ bh = sb_getblk(inode->i_sb, newblock);
+ if (!bh) {
+ err = -EIO;
+ goto cleanup;
@@ -715,36 +740,45 @@ Index: linux-stage/fs/ext3/extents.c
+ if ((err = ext3_journal_get_create_access(handle, bh)))
+ goto cleanup;
+
-+ neh = EXT_BLOCK_HDR(bh);
-+ neh->eh_entries = 1;
-+ neh->eh_magic = EXT3_EXT_MAGIC;
-+ neh->eh_max = ext3_ext_space_block_idx(tree);
-+ neh->eh_depth = depth - i;
++ neh = ext_block_hdr(bh);
++ neh->eh_entries = cpu_to_le16(1);
++ neh->eh_magic = cpu_to_le16(EXT3_EXT_MAGIC);
++ neh->eh_max = cpu_to_le16(ext3_ext_space_block_idx(inode));
++ neh->eh_depth = cpu_to_le16(depth - i);
+ fidx = EXT_FIRST_INDEX(neh);
+ fidx->ei_block = border;
-+ fidx->ei_leaf = oldblock;
++ fidx->ei_leaf = cpu_to_le32(oldblock);
+ fidx->ei_leaf_hi = fidx->ei_unused = 0;
+
-+ ext_debug(tree, "int.index at %d (block %lu): %lu -> %lu\n",
-+ i, newblock, border, oldblock);
++ ext_debug(inode, "int.index at %d (block %lu): %lu -> %lu\n", i,
++ newblock, (unsigned long) le32_to_cpu(border),
++ oldblock);
+ /* copy indexes */
+ m = 0;
+ path[i].p_idx++;
+
-+ ext_debug(tree, "cur 0x%p, last 0x%p\n", path[i].p_idx,
-+ EXT_MAX_INDEX(path[i].p_hdr));
-+ EXT_ASSERT(EXT_MAX_INDEX(path[i].p_hdr) ==
-+ EXT_LAST_INDEX(path[i].p_hdr));
++ ext_debug(inode, "cur 0x%p, last 0x%p\n", path[i].p_idx,
++ EXT_MAX_INDEX(path[i].p_hdr));
++ BUG_ON(EXT_MAX_INDEX(path[i].p_hdr) !=
++ EXT_LAST_INDEX(path[i].p_hdr));
+ while (path[i].p_idx <= EXT_MAX_INDEX(path[i].p_hdr)) {
-+ ext_debug(tree, "%d: move %d:%d in new index %lu\n",
-+ i, path[i].p_idx->ei_block,
-+ path[i].p_idx->ei_leaf, newblock);
-+ memmove(++fidx, path[i].p_idx++,
-+ sizeof(struct ext3_extent_idx));
++ ext_debug(inode, "%d: move %d:%d in new index %lu\n", i,
++ le32_to_cpu(path[i].p_idx->ei_block),
++ le32_to_cpu(path[i].p_idx->ei_leaf),
++ newblock);
++ /*memmove(++fidx, path[i].p_idx++,
++ sizeof(struct ext3_extent_idx));
+ neh->eh_entries++;
-+ EXT_ASSERT(neh->eh_entries <= neh->eh_max);
++ BUG_ON(neh->eh_entries > neh->eh_max);*/
++ path[i].p_idx++;
+ m++;
+ }
++ if (m) {
++ memmove(++fidx, path[i].p_idx - m,
++ sizeof(struct ext3_extent_idx) * m);
++ neh->eh_entries =
++ cpu_to_le16(le16_to_cpu(neh->eh_entries) + m);
++ }
+ set_buffer_uptodate(bh);
+ unlock_buffer(bh);
+
@@ -755,11 +789,11 @@ Index: linux-stage/fs/ext3/extents.c
+
+ /* correct old index */
+ if (m) {
-+ err = ext3_ext_get_access(handle, tree, path + i);
++ err = ext3_ext_get_access(handle, inode, path + i);
+ if (err)
+ goto cleanup;
-+ path[i].p_hdr->eh_entries -= m;
-+ err = ext3_ext_dirty(handle, tree, path + i);
++ path[i].p_hdr->eh_entries = cpu_to_le16(le16_to_cpu(path[i].p_hdr->eh_entries)-m);
++ err = ext3_ext_dirty(handle, inode, path + i);
+ if (err)
+ goto cleanup;
+ }
@@ -768,9 +802,11 @@ Index: linux-stage/fs/ext3/extents.c
+ }
+
+ /* insert new index */
-+ if (!err)
-+ err = ext3_ext_insert_index(handle, tree, path + at,
-+ border, newblock);
++ if (err)
++ goto cleanup;
++
++ err = ext3_ext_insert_index(handle, inode, path + at,
++ le32_to_cpu(border), newblock);
+
+cleanup:
+ if (bh) {
@@ -784,7 +820,7 @@ Index: linux-stage/fs/ext3/extents.c
+ for (i = 0; i < depth; i++) {
+ if (!ablocks[i])
+ continue;
-+ ext3_free_blocks(handle, tree->inode, ablocks[i], 1);
++ ext3_free_blocks(handle, inode, ablocks[i], 1);
+ }
+ }
+ kfree(ablocks);
@@ -799,10 +835,9 @@ Index: linux-stage/fs/ext3/extents.c
+ * - initialize new top-level, creating index that points to the
+ * just created block
+ */
-+static int ext3_ext_grow_indepth(handle_t *handle,
-+ struct ext3_extents_tree *tree,
-+ struct ext3_ext_path *path,
-+ struct ext3_extent *newext)
++static int ext3_ext_grow_indepth(handle_t *handle, struct inode *inode,
++ struct ext3_ext_path *path,
++ struct ext3_extent *newext)
+{
+ struct ext3_ext_path *curp = path;
+ struct ext3_extent_header *neh;
@@ -811,35 +846,35 @@ Index: linux-stage/fs/ext3/extents.c
+ unsigned long newblock;
+ int err = 0;
+
-+ newblock = ext3_ext_new_block(handle, tree, path, newext, &err);
++ newblock = ext3_ext_new_block(handle, inode, path, newext, &err);
+ if (newblock == 0)
+ return err;
+
-+ bh = sb_getblk(tree->inode->i_sb, newblock);
++ bh = sb_getblk(inode->i_sb, newblock);
+ if (!bh) {
+ err = -EIO;
-+ ext3_std_error(tree->inode->i_sb, err);
++ ext3_std_error(inode->i_sb, err);
+ return err;
+ }
+ lock_buffer(bh);
+
+ if ((err = ext3_journal_get_create_access(handle, bh))) {
+ unlock_buffer(bh);
-+ goto out;
++ goto out;
+ }
+
+ /* move top-level index/leaf into new block */
-+ memmove(bh->b_data, curp->p_hdr, tree->buffer_len);
++ memmove(bh->b_data, curp->p_hdr, sizeof(EXT3_I(inode)->i_data));
+
+ /* set size of new block */
-+ neh = EXT_BLOCK_HDR(bh);
++ neh = ext_block_hdr(bh);
+ /* old root could have indexes or leaves
-+ * so calculate eh_max right way */
-+ if (EXT_DEPTH(tree))
-+ neh->eh_max = ext3_ext_space_block_idx(tree);
++ * so calculate e_max right way */
++ if (ext_depth(inode))
++ neh->eh_max = cpu_to_le16(ext3_ext_space_block_idx(inode));
+ else
-+ neh->eh_max = ext3_ext_space_block(tree);
-+ neh->eh_magic = EXT3_EXT_MAGIC;
++ neh->eh_max = cpu_to_le16(ext3_ext_space_block(inode));
++ neh->eh_magic = cpu_to_le16(EXT3_EXT_MAGIC);
+ set_buffer_uptodate(bh);
+ unlock_buffer(bh);
+
@@ -847,25 +882,26 @@ Index: linux-stage/fs/ext3/extents.c
+ goto out;
+
+ /* create index in new top-level index: num,max,pointer */
-+ if ((err = ext3_ext_get_access(handle, tree, curp)))
++ if ((err = ext3_ext_get_access(handle, inode, curp)))
+ goto out;
+
-+ curp->p_hdr->eh_magic = EXT3_EXT_MAGIC;
-+ curp->p_hdr->eh_max = ext3_ext_space_root_idx(tree);
-+ curp->p_hdr->eh_entries = 1;
++ curp->p_hdr->eh_magic = cpu_to_le16(EXT3_EXT_MAGIC);
++ curp->p_hdr->eh_max = cpu_to_le16(ext3_ext_space_root_idx(inode));
++ curp->p_hdr->eh_entries = cpu_to_le16(1);
+ curp->p_idx = EXT_FIRST_INDEX(curp->p_hdr);
+ /* FIXME: it works, but actually path[0] can be index */
+ curp->p_idx->ei_block = EXT_FIRST_EXTENT(path[0].p_hdr)->ee_block;
-+ curp->p_idx->ei_leaf = newblock;
++ curp->p_idx->ei_leaf = cpu_to_le32(newblock);
+ curp->p_idx->ei_leaf_hi = curp->p_idx->ei_unused = 0;
+
-+ neh = EXT_ROOT_HDR(tree);
++ neh = ext_inode_hdr(inode);
+ fidx = EXT_FIRST_INDEX(neh);
-+ ext_debug(tree, "new root: num %d(%d), lblock %d, ptr %d\n",
-+ neh->eh_entries, neh->eh_max, fidx->ei_block, fidx->ei_leaf);
++ ext_debug(inode, "new root: num %d(%d), lblock %d, ptr %d\n",
++ le16_to_cpu(neh->eh_entries), le16_to_cpu(neh->eh_max),
++ le32_to_cpu(fidx->ei_block), le32_to_cpu(fidx->ei_leaf));
+
-+ neh->eh_depth = path->p_depth + 1;
-+ err = ext3_ext_dirty(handle, tree, curp);
++ neh->eh_depth = cpu_to_le16(path->p_depth + 1);
++ err = ext3_ext_dirty(handle, inode, curp);
+out:
+ brelse(bh);
+
@@ -876,17 +912,16 @@ Index: linux-stage/fs/ext3/extents.c
+ * routine finds empty index and adds new leaf. if no free index found
+ * then it requests in-depth growing
+ */
-+static int ext3_ext_create_new_leaf(handle_t *handle,
-+ struct ext3_extents_tree *tree,
-+ struct ext3_ext_path *path,
-+ struct ext3_extent *newext)
++static int ext3_ext_create_new_leaf(handle_t *handle, struct inode *inode,
++ struct ext3_ext_path *path,
++ struct ext3_extent *newext)
+{
+ struct ext3_ext_path *curp;
+ int depth, i, err = 0;
+
+repeat:
-+ i = depth = EXT_DEPTH(tree);
-+
++ i = depth = ext_depth(inode);
++
+ /* walk up to the tree and look for free index entry */
+ curp = path + depth;
+ while (i > 0 && !EXT_HAS_FREE_INDEX(curp)) {
@@ -899,39 +934,193 @@ Index: linux-stage/fs/ext3/extents.c
+ if (EXT_HAS_FREE_INDEX(curp)) {
+ /* if we found index with free entry, then use that
+ * entry: create all needed subtree and add new leaf */
-+ err = ext3_ext_split(handle, tree, path, newext, i);
++ err = ext3_ext_split(handle, inode, path, newext, i);
++ if (err)
++ goto out;
+
+ /* refill path */
+ ext3_ext_drop_refs(path);
-+ path = ext3_ext_find_extent(tree, newext->ee_block, path);
++ path = ext3_ext_find_extent(inode,
++ le32_to_cpu(newext->ee_block),
++ path);
+ if (IS_ERR(path))
+ err = PTR_ERR(path);
+ } else {
+ /* tree is full, time to grow in depth */
-+ err = ext3_ext_grow_indepth(handle, tree, path, newext);
++ err = ext3_ext_grow_indepth(handle, inode, path, newext);
++ if (err)
++ goto out;
+
+ /* refill path */
+ ext3_ext_drop_refs(path);
-+ path = ext3_ext_find_extent(tree, newext->ee_block, path);
-+ if (IS_ERR(path))
++ path = ext3_ext_find_extent(inode,
++ le32_to_cpu(newext->ee_block),
++ path);
++ if (IS_ERR(path)) {
+ err = PTR_ERR(path);
++ goto out;
++ }
+
+ /*
+ * only first (depth 0 -> 1) produces free space
+ * in all other cases we have to split growed tree
+ */
-+ depth = EXT_DEPTH(tree);
++ depth = ext_depth(inode);
+ if (path[depth].p_hdr->eh_entries == path[depth].p_hdr->eh_max) {
+ /* now we need split */
+ goto repeat;
+ }
+ }
+
-+ if (err)
-+ return err;
++out:
++ return err;
++}
++
++/*
++ * search the closest allocated block to the left for *logical
++ * and returns it at @logical + it's physical address at @phys
++ * if *logical is the smallest allocated block, the function
++ * returns 0 at @phys
++ * return value contains 0 (success) or error code
++ */
++int
++ext3_ext_search_left(struct inode *inode, struct ext3_ext_path *path,
++ unsigned long *logical, unsigned long *phys)
++{
++ struct ext3_extent_idx *ix;
++ struct ext3_extent *ex;
++ int depth;
++
++ BUG_ON(path == NULL);
++ depth = path->p_depth;
++ *phys = 0;
++
++ if (depth == 0 && path->p_ext == NULL)
++ return 0;
++
++ /* usually extent in the path covers blocks smaller
++ * then *logical, but it can be that extent is the
++ * first one in the file */
++
++ ex = path[depth].p_ext;
++ if (*logical < le32_to_cpu(ex->ee_block)) {
++ BUG_ON(EXT_FIRST_EXTENT(path[depth].p_hdr) != ex);
++ while (--depth >= 0) {
++ ix = path[depth].p_idx;
++ BUG_ON(ix != EXT_FIRST_INDEX(path[depth].p_hdr));
++ }
++ return 0;
++ }
++
++ BUG_ON(*logical < le32_to_cpu(ex->ee_block) + le16_to_cpu(ex->ee_len));
++
++ *logical = le32_to_cpu(ex->ee_block) + le16_to_cpu(ex->ee_len) - 1;
++ *phys = le32_to_cpu(ex->ee_start) + le16_to_cpu(ex->ee_len) - 1;
++ return 0;
++}
++EXPORT_SYMBOL(ext3_ext_search_left);
++
++/*
++ * search the closest allocated block to the right for *logical
++ * and returns it at @logical + it's physical address at @phys
++ * if *logical is the smallest allocated block, the function
++ * returns 0 at @phys
++ * return value contains 0 (success) or error code
++ */
++int
++ext3_ext_search_right(struct inode *inode, struct ext3_ext_path *path,
++ unsigned long *logical, unsigned long *phys)
++{
++ struct buffer_head *bh = NULL;
++ struct ext3_extent_header *eh;
++ struct ext3_extent_idx *ix;
++ struct ext3_extent *ex;
++ unsigned long block;
++ int depth;
++
++ BUG_ON(path == NULL);
++ depth = path->p_depth;
++ *phys = 0;
++
++ if (depth == 0 && path->p_ext == NULL)
++ return 0;
++
++ /* usually extent in the path covers blocks smaller
++ * then *logical, but it can be that extent is the
++ * first one in the file */
++
++ ex = path[depth].p_ext;
++ if (*logical < le32_to_cpu(ex->ee_block)) {
++ BUG_ON(EXT_FIRST_EXTENT(path[depth].p_hdr) != ex);
++ while (--depth >= 0) {
++ ix = path[depth].p_idx;
++ BUG_ON(ix != EXT_FIRST_INDEX(path[depth].p_hdr));
++ }
++ *logical = le32_to_cpu(ex->ee_block);
++ *phys = le32_to_cpu(ex->ee_start);
++ return 0;
++ }
++
++ BUG_ON(*logical < le32_to_cpu(ex->ee_block) + le16_to_cpu(ex->ee_len));
++
++ if (ex != EXT_LAST_EXTENT(path[depth].p_hdr)) {
++ /* next allocated block in this leaf */
++ ex++;
++ *logical = le32_to_cpu(ex->ee_block);
++ *phys = le32_to_cpu(ex->ee_start);
++ return 0;
++ }
++
++ /* go up and search for index to the right */
++ while (--depth >= 0) {
++ ix = path[depth].p_idx;
++ if (ix != EXT_LAST_INDEX(path[depth].p_hdr))
++ break;
++ }
++
++ if (depth < 0) {
++ /* we've gone up to the root and
++ * found no index to the right */
++ return 0;
++ }
++
++ /* we've found index to the right, let's
++ * follow it and find the closest allocated
++ * block to the right */
++ ix++;
++ block = le32_to_cpu(ix->ei_leaf);
++ while (++depth < path->p_depth) {
++ bh = sb_bread(inode->i_sb, block);
++ if (bh == NULL)
++ return -EIO;
++ eh = ext_block_hdr(bh);
++ if (ext3_ext_check_header(inode, eh, path->p_depth - depth)) {
++ brelse(bh);
++ return -EIO;
++ }
++ ix = EXT_FIRST_INDEX(eh);
++ block = le32_to_cpu(ix->ei_leaf);
++ brelse(bh);
++ }
+
++ bh = sb_bread(inode->i_sb, block);
++ if (bh == NULL)
++ return -EIO;
++ eh = ext_block_hdr(bh);
++ if (ext3_ext_check_header(inode, eh, 0)) {
++ brelse(bh);
++ return -EIO;
++ }
++ ex = EXT_FIRST_EXTENT(eh);
++ *logical = le32_to_cpu(ex->ee_block);
++ *phys = le32_to_cpu(ex->ee_start);
++ brelse(bh);
+ return 0;
++
+}
++EXPORT_SYMBOL(ext3_ext_search_right);
++
++
+
+/*
+ * returns allocated block in subsequent extent or EXT_MAX_BLOCK
@@ -944,26 +1133,25 @@ Index: linux-stage/fs/ext3/extents.c
+{
+ int depth;
+
-+ EXT_ASSERT(path != NULL);
++ BUG_ON(path == NULL);
+ depth = path->p_depth;
+
+ if (depth == 0 && path->p_ext == NULL)
+ return EXT_MAX_BLOCK;
+
-+ /* FIXME: what if index isn't full ?! */
+ while (depth >= 0) {
+ if (depth == path->p_depth) {
+ /* leaf */
+ if (path[depth].p_ext !=
-+ EXT_LAST_EXTENT(path[depth].p_hdr))
-+ return path[depth].p_ext[1].ee_block;
++ EXT_LAST_EXTENT(path[depth].p_hdr))
++ return le32_to_cpu(path[depth].p_ext[1].ee_block);
+ } else {
+ /* index */
+ if (path[depth].p_idx !=
-+ EXT_LAST_INDEX(path[depth].p_hdr))
-+ return path[depth].p_idx[1].ei_block;
++ EXT_LAST_INDEX(path[depth].p_hdr))
++ return le32_to_cpu(path[depth].p_idx[1].ei_block);
+ }
-+ depth--;
++ depth--;
+ }
+
+ return EXT_MAX_BLOCK;
@@ -972,12 +1160,12 @@ Index: linux-stage/fs/ext3/extents.c
+/*
+ * returns first allocated block from next leaf or EXT_MAX_BLOCK
+ */
-+static unsigned ext3_ext_next_leaf_block(struct ext3_extents_tree *tree,
-+ struct ext3_ext_path *path)
++static unsigned ext3_ext_next_leaf_block(struct inode *inode,
++ struct ext3_ext_path *path)
+{
+ int depth;
+
-+ EXT_ASSERT(path != NULL);
++ BUG_ON(path == NULL);
+ depth = path->p_depth;
+
+ /* zero-tree has no leaf blocks at all */
@@ -986,12 +1174,12 @@ Index: linux-stage/fs/ext3/extents.c
+
+ /* go to index block */
+ depth--;
-+
++
+ while (depth >= 0) {
+ if (path[depth].p_idx !=
-+ EXT_LAST_INDEX(path[depth].p_hdr))
-+ return path[depth].p_idx[1].ei_block;
-+ depth--;
++ EXT_LAST_INDEX(path[depth].p_hdr))
++ return le32_to_cpu(path[depth].p_idx[1].ei_block);
++ depth--;
+ }
+
+ return EXT_MAX_BLOCK;
@@ -1002,49 +1190,49 @@ Index: linux-stage/fs/ext3/extents.c
+ * then we have to correct all indexes above
+ * TODO: do we need to correct tree in all cases?
+ */
-+int ext3_ext_correct_indexes(handle_t *handle, struct ext3_extents_tree *tree,
-+ struct ext3_ext_path *path)
++int ext3_ext_correct_indexes(handle_t *handle, struct inode *inode,
++ struct ext3_ext_path *path)
+{
+ struct ext3_extent_header *eh;
-+ int depth = EXT_DEPTH(tree);
++ int depth = ext_depth(inode);
+ struct ext3_extent *ex;
-+ unsigned long border;
++ __le32 border;
+ int k, err = 0;
-+
++
+ eh = path[depth].p_hdr;
+ ex = path[depth].p_ext;
-+ EXT_ASSERT(ex);
-+ EXT_ASSERT(eh);
-+
++ BUG_ON(ex == NULL);
++ BUG_ON(eh == NULL);
++
+ if (depth == 0) {
+ /* there is no tree at all */
+ return 0;
+ }
-+
++
+ if (ex != EXT_FIRST_EXTENT(eh)) {
+ /* we correct tree if first leaf got modified only */
+ return 0;
+ }
-+
++
+ /*
+ * TODO: we need correction if border is smaller then current one
+ */
+ k = depth - 1;
+ border = path[depth].p_ext->ee_block;
-+ if ((err = ext3_ext_get_access(handle, tree, path + k)))
++ if ((err = ext3_ext_get_access(handle, inode, path + k)))
+ return err;
+ path[k].p_idx->ei_block = border;
-+ if ((err = ext3_ext_dirty(handle, tree, path + k)))
++ if ((err = ext3_ext_dirty(handle, inode, path + k)))
+ return err;
+
+ while (k--) {
+ /* change all left-side indexes */
+ if (path[k+1].p_idx != EXT_FIRST_INDEX(path[k+1].p_hdr))
+ break;
-+ if ((err = ext3_ext_get_access(handle, tree, path + k)))
++ if ((err = ext3_ext_get_access(handle, inode, path + k)))
+ break;
+ path[k].p_idx->ei_block = border;
-+ if ((err = ext3_ext_dirty(handle, tree, path + k)))
++ if ((err = ext3_ext_dirty(handle, inode, path + k)))
+ break;
+ }
+
@@ -1052,22 +1240,23 @@ Index: linux-stage/fs/ext3/extents.c
+}
+
+static int inline
-+ext3_can_extents_be_merged(struct ext3_extents_tree *tree,
-+ struct ext3_extent *ex1,
-+ struct ext3_extent *ex2)
++ext3_can_extents_be_merged(struct inode *inode, struct ext3_extent *ex1,
++ struct ext3_extent *ex2)
+{
-+ if (ex1->ee_block + ex1->ee_len != ex2->ee_block)
++ /* FIXME: 48bit support */
++ if (le32_to_cpu(ex1->ee_block) + le16_to_cpu(ex1->ee_len)
++ != le32_to_cpu(ex2->ee_block))
+ return 0;
+
+#ifdef AGRESSIVE_TEST
-+ if (ex1->ee_len >= 4)
++ if (le16_to_cpu(ex1->ee_len) >= 4)
+ return 0;
+#endif
+
-+ if (!tree->ops->mergable)
++ if (le32_to_cpu(ex1->ee_start) + le16_to_cpu(ex1->ee_len)
++ == le32_to_cpu(ex2->ee_start))
+ return 1;
-+
-+ return tree->ops->mergable(ex1, ex2);
++ return 0;
+}
+
+/*
@@ -1075,9 +1264,9 @@ Index: linux-stage/fs/ext3/extents.c
+ * extent or inserts requested extent as new one into the tree,
+ * creating new leaf in no-space case
+ */
-+int ext3_ext_insert_extent(handle_t *handle, struct ext3_extents_tree *tree,
-+ struct ext3_ext_path *path,
-+ struct ext3_extent *newext)
++int ext3_ext_insert_extent(handle_t *handle, struct inode *inode,
++ struct ext3_ext_path *path,
++ struct ext3_extent *newext)
+{
+ struct ext3_extent_header * eh;
+ struct ext3_extent *ex, *fex;
@@ -1085,100 +1274,109 @@ Index: linux-stage/fs/ext3/extents.c
+ struct ext3_ext_path *npath = NULL;
+ int depth, len, err, next;
+
-+ EXT_ASSERT(newext->ee_len > 0);
-+ depth = EXT_DEPTH(tree);
++ BUG_ON(newext->ee_len == 0);
++ depth = ext_depth(inode);
+ ex = path[depth].p_ext;
-+ EXT_ASSERT(path[depth].p_hdr);
++ BUG_ON(path[depth].p_hdr == NULL);
+
+ /* try to insert block into found extent and return */
-+ if (ex && ext3_can_extents_be_merged(tree, ex, newext)) {
-+ ext_debug(tree, "append %d block to %d:%d (from %d)\n",
-+ newext->ee_len, ex->ee_block, ex->ee_len,
-+ ex->ee_start);
-+ if ((err = ext3_ext_get_access(handle, tree, path + depth)))
++ if (ex && ext3_can_extents_be_merged(inode, ex, newext)) {
++ ext_debug(inode, "append %d block to %d:%d (from %d)\n",
++ le16_to_cpu(newext->ee_len),
++ le32_to_cpu(ex->ee_block),
++ le16_to_cpu(ex->ee_len),
++ le32_to_cpu(ex->ee_start));
++ if ((err = ext3_ext_get_access(handle, inode, path + depth)))
+ return err;
-+ ex->ee_len += newext->ee_len;
++ ex->ee_len = cpu_to_le16(le16_to_cpu(ex->ee_len)
++ + le16_to_cpu(newext->ee_len));
+ eh = path[depth].p_hdr;
+ nearex = ex;
+ goto merge;
+ }
+
+repeat:
-+ depth = EXT_DEPTH(tree);
++ depth = ext_depth(inode);
+ eh = path[depth].p_hdr;
-+ if (eh->eh_entries < eh->eh_max)
++ if (le16_to_cpu(eh->eh_entries) < le16_to_cpu(eh->eh_max))
+ goto has_space;
+
+ /* probably next leaf has space for us? */
+ fex = EXT_LAST_EXTENT(eh);
-+ next = ext3_ext_next_leaf_block(tree, path);
-+ if (newext->ee_block > fex->ee_block && next != EXT_MAX_BLOCK) {
-+ ext_debug(tree, "next leaf block - %d\n", next);
-+ EXT_ASSERT(!npath);
-+ npath = ext3_ext_find_extent(tree, next, NULL);
++ next = ext3_ext_next_leaf_block(inode, path);
++ if (le32_to_cpu(newext->ee_block) > le32_to_cpu(fex->ee_block)
++ && next != EXT_MAX_BLOCK) {
++ ext_debug(inode, "next leaf block - %d\n", next);
++ BUG_ON(npath != NULL);
++ npath = ext3_ext_find_extent(inode, next, NULL);
+ if (IS_ERR(npath))
+ return PTR_ERR(npath);
-+ EXT_ASSERT(npath->p_depth == path->p_depth);
++ BUG_ON(npath->p_depth != path->p_depth);
+ eh = npath[depth].p_hdr;
-+ if (eh->eh_entries < eh->eh_max) {
-+ ext_debug(tree, "next leaf isnt full(%d)\n",
-+ eh->eh_entries);
++ if (le16_to_cpu(eh->eh_entries) < le16_to_cpu(eh->eh_max)) {
++ ext_debug(inode, "next leaf isnt full(%d)\n",
++ le16_to_cpu(eh->eh_entries));
+ path = npath;
+ goto repeat;
+ }
-+ ext_debug(tree, "next leaf hasno free space(%d,%d)\n",
-+ eh->eh_entries, eh->eh_max);
++ ext_debug(inode, "next leaf has no free space(%d,%d)\n",
++ le16_to_cpu(eh->eh_entries), le16_to_cpu(eh->eh_max));
+ }
+
+ /*
+ * there is no free space in found leaf
+ * we're gonna add new leaf in the tree
+ */
-+ err = ext3_ext_create_new_leaf(handle, tree, path, newext);
++ err = ext3_ext_create_new_leaf(handle, inode, path, newext);
+ if (err)
+ goto cleanup;
-+ depth = EXT_DEPTH(tree);
++ depth = ext_depth(inode);
+ eh = path[depth].p_hdr;
+
+has_space:
+ nearex = path[depth].p_ext;
+
-+ if ((err = ext3_ext_get_access(handle, tree, path + depth)))
++ if ((err = ext3_ext_get_access(handle, inode, path + depth)))
+ goto cleanup;
+
+ if (!nearex) {
+ /* there is no extent in this leaf, create first one */
-+ ext_debug(tree, "first extent in the leaf: %d:%d:%d\n",
-+ newext->ee_block, newext->ee_start,
-+ newext->ee_len);
++ ext_debug(inode, "first extent in the leaf: %d:%d:%d\n",
++ le32_to_cpu(newext->ee_block),
++ le32_to_cpu(newext->ee_start),
++ le16_to_cpu(newext->ee_len));
+ path[depth].p_ext = EXT_FIRST_EXTENT(eh);
-+ } else if (newext->ee_block > nearex->ee_block) {
-+ EXT_ASSERT(newext->ee_block != nearex->ee_block);
++ } else if (le32_to_cpu(newext->ee_block)
++ > le32_to_cpu(nearex->ee_block)) {
++ /* BUG_ON(newext->ee_block == nearex->ee_block); */
+ if (nearex != EXT_LAST_EXTENT(eh)) {
+ len = EXT_MAX_EXTENT(eh) - nearex;
+ len = (len - 1) * sizeof(struct ext3_extent);
+ len = len < 0 ? 0 : len;
-+ ext_debug(tree, "insert %d:%d:%d after: nearest 0x%p, "
-+ "move %d from 0x%p to 0x%p\n",
-+ newext->ee_block, newext->ee_start,
-+ newext->ee_len,
-+ nearex, len, nearex + 1, nearex + 2);
++ ext_debug(inode, "insert %d:%d:%d after: nearest 0x%p, "
++ "move %d from 0x%p to 0x%p\n",
++ le32_to_cpu(newext->ee_block),
++ le32_to_cpu(newext->ee_start),
++ le16_to_cpu(newext->ee_len),
++ nearex, len, nearex + 1, nearex + 2);
+ memmove(nearex + 2, nearex + 1, len);
+ }
+ path[depth].p_ext = nearex + 1;
+ } else {
-+ EXT_ASSERT(newext->ee_block != nearex->ee_block);
++ BUG_ON(newext->ee_block == nearex->ee_block);
+ len = (EXT_MAX_EXTENT(eh) - nearex) * sizeof(struct ext3_extent);
+ len = len < 0 ? 0 : len;
-+ ext_debug(tree, "insert %d:%d:%d before: nearest 0x%p, "
-+ "move %d from 0x%p to 0x%p\n",
-+ newext->ee_block, newext->ee_start, newext->ee_len,
-+ nearex, len, nearex + 1, nearex + 2);
++ ext_debug(inode, "insert %d:%d:%d before: nearest 0x%p, "
++ "move %d from 0x%p to 0x%p\n",
++ le32_to_cpu(newext->ee_block),
++ le32_to_cpu(newext->ee_start),
++ le16_to_cpu(newext->ee_len),
++ nearex, len, nearex + 1, nearex + 2);
+ memmove(nearex + 1, nearex, len);
+ path[depth].p_ext = nearex;
+ }
+
-+ eh->eh_entries++;
++ eh->eh_entries = cpu_to_le16(le16_to_cpu(eh->eh_entries)+1);
+ nearex = path[depth].p_ext;
+ nearex->ee_block = newext->ee_block;
+ nearex->ee_start = newext->ee_start;
@@ -1189,40 +1387,42 @@ Index: linux-stage/fs/ext3/extents.c
+merge:
+ /* try to merge extents to the right */
+ while (nearex < EXT_LAST_EXTENT(eh)) {
-+ if (!ext3_can_extents_be_merged(tree, nearex, nearex + 1))
++ if (!ext3_can_extents_be_merged(inode, nearex, nearex + 1))
+ break;
+ /* merge with next extent! */
-+ nearex->ee_len += nearex[1].ee_len;
++ nearex->ee_len = cpu_to_le16(le16_to_cpu(nearex->ee_len)
++ + le16_to_cpu(nearex[1].ee_len));
+ if (nearex + 1 < EXT_LAST_EXTENT(eh)) {
-+ len = (EXT_LAST_EXTENT(eh) - nearex - 1) *
-+ sizeof(struct ext3_extent);
++ len = (EXT_LAST_EXTENT(eh) - nearex - 1)
++ * sizeof(struct ext3_extent);
+ memmove(nearex + 1, nearex + 2, len);
+ }
-+ eh->eh_entries--;
-+ EXT_ASSERT(eh->eh_entries > 0);
++ eh->eh_entries = cpu_to_le16(le16_to_cpu(eh->eh_entries)-1);
++ BUG_ON(eh->eh_entries == 0);
+ }
+
+ /* try to merge extents to the left */
+
+ /* time to correct all indexes above */
-+ err = ext3_ext_correct_indexes(handle, tree, path);
++ err = ext3_ext_correct_indexes(handle, inode, path);
+ if (err)
+ goto cleanup;
+
-+ err = ext3_ext_dirty(handle, tree, path + depth);
++ err = ext3_ext_dirty(handle, inode, path + depth);
+
+cleanup:
+ if (npath) {
+ ext3_ext_drop_refs(npath);
+ kfree(npath);
+ }
-+ ext3_ext_tree_changed(tree);
-+ ext3_ext_invalidate_cache(tree);
++ ext3_ext_tree_changed(inode);
++ ext3_ext_invalidate_cache(inode);
+ return err;
+}
+
-+int ext3_ext_walk_space(struct ext3_extents_tree *tree, unsigned long block,
-+ unsigned long num, ext_prepare_callback func)
++int ext3_ext_walk_space(struct inode *inode, unsigned long block,
++ unsigned long num, ext_prepare_callback func,
++ void *cbdata)
+{
+ struct ext3_ext_path *path = NULL;
+ struct ext3_ext_cache cbex;
@@ -1231,23 +1431,21 @@ Index: linux-stage/fs/ext3/extents.c
+ unsigned long last = block + num;
+ int depth, exists, err = 0;
+
-+ EXT_ASSERT(tree);
-+ EXT_ASSERT(func);
-+ EXT_ASSERT(tree->inode);
-+ EXT_ASSERT(tree->root);
++ BUG_ON(func == NULL);
++ BUG_ON(inode == NULL);
+
+ while (block < last && block != EXT_MAX_BLOCK) {
+ num = last - block;
+ /* find extent for this block */
-+ path = ext3_ext_find_extent(tree, block, path);
++ path = ext3_ext_find_extent(inode, block, path);
+ if (IS_ERR(path)) {
+ err = PTR_ERR(path);
+ path = NULL;
+ break;
+ }
+
-+ depth = EXT_DEPTH(tree);
-+ EXT_ASSERT(path[depth].p_hdr);
++ depth = ext_depth(inode);
++ BUG_ON(path[depth].p_hdr == NULL);
+ ex = path[depth].p_ext;
+ next = ext3_ext_next_allocated_block(path);
+
@@ -1257,32 +1455,33 @@ Index: linux-stage/fs/ext3/extents.c
+ * all requested space */
+ start = block;
+ end = block + num;
-+ } else if (ex->ee_block > block) {
++ } else if (le32_to_cpu(ex->ee_block) > block) {
+ /* need to allocate space before found extent */
+ start = block;
-+ end = ex->ee_block;
++ end = le32_to_cpu(ex->ee_block);
+ if (block + num < end)
+ end = block + num;
-+ } else if (block >= ex->ee_block + ex->ee_len) {
++ } else if (block >=
++ le32_to_cpu(ex->ee_block) + le16_to_cpu(ex->ee_len)) {
+ /* need to allocate space after found extent */
+ start = block;
+ end = block + num;
+ if (end >= next)
+ end = next;
-+ } else if (block >= ex->ee_block) {
-+ /*
++ } else if (block >= le32_to_cpu(ex->ee_block)) {
++ /*
+ * some part of requested space is covered
+ * by found extent
+ */
+ start = block;
-+ end = ex->ee_block + ex->ee_len;
++ end = le32_to_cpu(ex->ee_block) + le16_to_cpu(ex->ee_len);
+ if (block + num < end)
+ end = block + num;
+ exists = 1;
+ } else {
+ BUG();
+ }
-+ EXT_ASSERT(end > start);
++ BUG_ON(end <= start);
+
+ if (!exists) {
+ cbex.ec_block = start;
@@ -1290,15 +1489,14 @@ Index: linux-stage/fs/ext3/extents.c
+ cbex.ec_start = 0;
+ cbex.ec_type = EXT3_EXT_CACHE_GAP;
+ } else {
-+ cbex.ec_block = ex->ee_block;
-+ cbex.ec_len = ex->ee_len;
-+ cbex.ec_start = ex->ee_start;
++ cbex.ec_block = le32_to_cpu(ex->ee_block);
++ cbex.ec_len = le16_to_cpu(ex->ee_len);
++ cbex.ec_start = le32_to_cpu(ex->ee_start);
+ cbex.ec_type = EXT3_EXT_CACHE_EXTENT;
+ }
+
-+ EXT_ASSERT(cbex.ec_len > 0);
-+ EXT_ASSERT(path[depth].p_hdr);
-+ err = func(tree, path, &cbex);
++ BUG_ON(cbex.ec_len == 0);
++ err = func(inode, path, &cbex, cbdata);
+ ext3_ext_drop_refs(path);
+
+ if (err < 0)
@@ -1310,7 +1508,7 @@ Index: linux-stage/fs/ext3/extents.c
+ break;
+ }
+
-+ if (EXT_DEPTH(tree) != depth) {
++ if (ext_depth(inode) != depth) {
+ /* depth was changed. we have to realloc path */
+ kfree(path);
+ path = NULL;
@@ -1328,16 +1526,16 @@ Index: linux-stage/fs/ext3/extents.c
+}
+
+static inline void
-+ext3_ext_put_in_cache(struct ext3_extents_tree *tree, __u32 block,
-+ __u32 len, __u32 start, int type)
++ext3_ext_put_in_cache(struct inode *inode, __u32 block,
++ __u32 len, __u32 start, int type)
+{
-+ EXT_ASSERT(len > 0);
-+ if (tree->cex) {
-+ tree->cex->ec_type = type;
-+ tree->cex->ec_block = block;
-+ tree->cex->ec_len = len;
-+ tree->cex->ec_start = start;
-+ }
++ struct ext3_ext_cache *cex;
++ BUG_ON(len == 0);
++ cex = &EXT3_I(inode)->i_cached_extent;
++ cex->ec_type = type;
++ cex->ec_block = block;
++ cex->ec_len = len;
++ cex->ec_start = start;
+}
+
+/*
@@ -1345,74 +1543,70 @@ Index: linux-stage/fs/ext3/extents.c
+ * and cache this gap
+ */
+static inline void
-+ext3_ext_put_gap_in_cache(struct ext3_extents_tree *tree,
-+ struct ext3_ext_path *path,
-+ unsigned long block)
++ext3_ext_put_gap_in_cache(struct inode *inode, struct ext3_ext_path *path,
++ unsigned long block)
+{
-+ int depth = EXT_DEPTH(tree);
++ int depth = ext_depth(inode);
+ unsigned long lblock, len;
+ struct ext3_extent *ex;
+
-+ if (!tree->cex)
-+ return;
-+
+ ex = path[depth].p_ext;
+ if (ex == NULL) {
+ /* there is no extent yet, so gap is [0;-] */
+ lblock = 0;
+ len = EXT_MAX_BLOCK;
-+ ext_debug(tree, "cache gap(whole file):");
-+ } else if (block < ex->ee_block) {
++ ext_debug(inode, "cache gap(whole file):");
++ } else if (block < le32_to_cpu(ex->ee_block)) {
+ lblock = block;
-+ len = ex->ee_block - block;
-+ ext_debug(tree, "cache gap(before): %lu [%lu:%lu]",
-+ (unsigned long) block,
-+ (unsigned long) ex->ee_block,
-+ (unsigned long) ex->ee_len);
-+ } else if (block >= ex->ee_block + ex->ee_len) {
-+ lblock = ex->ee_block + ex->ee_len;
++ len = le32_to_cpu(ex->ee_block) - block;
++ ext_debug(inode, "cache gap(before): %lu [%lu:%lu]",
++ (unsigned long) block,
++ (unsigned long) le32_to_cpu(ex->ee_block),
++ (unsigned long) le16_to_cpu(ex->ee_len));
++ } else if (block >= le32_to_cpu(ex->ee_block)
++ + le16_to_cpu(ex->ee_len)) {
++ lblock = le32_to_cpu(ex->ee_block)
++ + le16_to_cpu(ex->ee_len);
+ len = ext3_ext_next_allocated_block(path);
-+ ext_debug(tree, "cache gap(after): [%lu:%lu] %lu",
-+ (unsigned long) ex->ee_block,
-+ (unsigned long) ex->ee_len,
-+ (unsigned long) block);
-+ EXT_ASSERT(len > lblock);
++ ext_debug(inode, "cache gap(after): [%lu:%lu] %lu",
++ (unsigned long) le32_to_cpu(ex->ee_block),
++ (unsigned long) le16_to_cpu(ex->ee_len),
++ (unsigned long) block);
++ BUG_ON(len == lblock);
+ len = len - lblock;
+ } else {
+ lblock = len = 0;
+ BUG();
+ }
+
-+ ext_debug(tree, " -> %lu:%lu\n", (unsigned long) lblock, len);
-+ ext3_ext_put_in_cache(tree, lblock, len, 0, EXT3_EXT_CACHE_GAP);
++ ext_debug(inode, " -> %lu:%lu\n", (unsigned long) lblock, len);
++ ext3_ext_put_in_cache(inode, lblock, len, 0, EXT3_EXT_CACHE_GAP);
+}
+
+static inline int
-+ext3_ext_in_cache(struct ext3_extents_tree *tree, unsigned long block,
-+ struct ext3_extent *ex)
++ext3_ext_in_cache(struct inode *inode, unsigned long block,
++ struct ext3_extent *ex)
+{
-+ struct ext3_ext_cache *cex = tree->cex;
++ struct ext3_ext_cache *cex;
+
-+ /* is there cache storage at all? */
-+ if (!cex)
-+ return EXT3_EXT_CACHE_NO;
++ cex = &EXT3_I(inode)->i_cached_extent;
+
+ /* has cache valid data? */
+ if (cex->ec_type == EXT3_EXT_CACHE_NO)
+ return EXT3_EXT_CACHE_NO;
+
-+ EXT_ASSERT(cex->ec_type == EXT3_EXT_CACHE_GAP ||
-+ cex->ec_type == EXT3_EXT_CACHE_EXTENT);
++ BUG_ON(cex->ec_type != EXT3_EXT_CACHE_GAP &&
++ cex->ec_type != EXT3_EXT_CACHE_EXTENT);
+ if (block >= cex->ec_block && block < cex->ec_block + cex->ec_len) {
-+ ex->ee_block = cex->ec_block;
-+ ex->ee_start = cex->ec_start;
++ ex->ee_block = cpu_to_le32(cex->ec_block);
++ ex->ee_start = cpu_to_le32(cex->ec_start);
+ ex->ee_start_hi = 0;
-+ ex->ee_len = cex->ec_len;
-+ ext_debug(tree, "%lu cached by %lu:%lu:%lu\n",
-+ (unsigned long) block,
-+ (unsigned long) ex->ee_block,
-+ (unsigned long) ex->ee_len,
-+ (unsigned long) ex->ee_start);
++ ex->ee_len = cpu_to_le16(cex->ec_len);
++ ext_debug(inode, "%lu cached by %lu:%lu:%lu\n",
++ (unsigned long) block,
++ (unsigned long) cex->ec_block,
++ (unsigned long) cex->ec_len,
++ (unsigned long) cex->ec_start);
+ return cex->ec_type;
+ }
+
@@ -1425,272 +1619,247 @@ Index: linux-stage/fs/ext3/extents.c
+ * it's used in truncate case only. thus all requests are for
+ * last index in the block only
+ */
-+int ext3_ext_rm_idx(handle_t *handle, struct ext3_extents_tree *tree,
-+ struct ext3_ext_path *path)
++int ext3_ext_rm_idx(handle_t *handle, struct inode *inode,
++ struct ext3_ext_path *path)
+{
+ struct buffer_head *bh;
+ int err;
-+
++ unsigned long leaf;
++
+ /* free index block */
+ path--;
-+ EXT_ASSERT(path->p_hdr->eh_entries);
-+ if ((err = ext3_ext_get_access(handle, tree, path)))
++ leaf = le32_to_cpu(path->p_idx->ei_leaf);
++ BUG_ON(path->p_hdr->eh_entries == 0);
++ if ((err = ext3_ext_get_access(handle, inode, path)))
+ return err;
-+ path->p_hdr->eh_entries--;
-+ if ((err = ext3_ext_dirty(handle, tree, path)))
++ path->p_hdr->eh_entries = cpu_to_le16(le16_to_cpu(path->p_hdr->eh_entries)-1);
++ if ((err = ext3_ext_dirty(handle, inode, path)))
+ return err;
-+ ext_debug(tree, "index is empty, remove it, free block %d\n",
-+ path->p_idx->ei_leaf);
-+ bh = sb_find_get_block(tree->inode->i_sb, path->p_idx->ei_leaf);
-+ ext3_forget(handle, 1, tree->inode, bh, path->p_idx->ei_leaf);
-+ ext3_free_blocks(handle, tree->inode, path->p_idx->ei_leaf, 1);
++ ext_debug(inode, "index is empty, remove it, free block %lu\n", leaf);
++ bh = sb_find_get_block(inode->i_sb, leaf);
++ ext3_forget(handle, 1, inode, bh, leaf);
++ ext3_free_blocks(handle, inode, leaf, 1);
+ return err;
+}
+
-+int ext3_ext_calc_credits_for_insert(struct ext3_extents_tree *tree,
-+ struct ext3_ext_path *path)
++/*
++ * This routine returns max. credits extent tree can consume.
++ * It should be OK for low-performance paths like ->writepage()
++ * To allow many writing process to fit a single transaction,
++ * caller should calculate credits under truncate_mutex and
++ * pass actual path.
++ */
++int inline ext3_ext_calc_credits_for_insert(struct inode *inode,
++ struct ext3_ext_path *path)
+{
-+ int depth = EXT_DEPTH(tree);
-+ int needed;
++ int depth, needed;
+
+ if (path) {
+ /* probably there is space in leaf? */
-+ if (path[depth].p_hdr->eh_entries < path[depth].p_hdr->eh_max)
++ depth = ext_depth(inode);
++ if (le16_to_cpu(path[depth].p_hdr->eh_entries)
++ < le16_to_cpu(path[depth].p_hdr->eh_max))
+ return 1;
+ }
-+
++
+ /*
-+ * the worste case we're expecting is creation of the
-+ * new root (growing in depth) with index splitting
-+ * for splitting we have to consider depth + 1 because
-+ * previous growing could increase it
++ * given 32bit logical block (4294967296 blocks), max. tree
++ * can be 4 levels in depth -- 4 * 340^4 == 53453440000.
++ * let's also add one more level for imbalance.
+ */
-+ depth = depth + 1;
++ depth = 5;
+
-+ /*
-+ * growing in depth:
-+ * block allocation + new root + old root
++ /* allocation of new data block(s) */
++ needed = 2;
++
++ /*
++ * tree can be full, so it'd need to grow in depth:
++ * we need one credit to modify old root, credits for
++ * new root will be added in split accounting
+ */
-+ needed = EXT3_ALLOC_NEEDED + 2;
++ needed += 1;
+
-+ /* index split. we may need:
-+ * allocate intermediate indexes and new leaf
-+ * change two blocks at each level, but root
-+ * modify root block (inode)
++ /*
++ * Index split can happen, we'd need:
++ * allocate intermediate indexes (bitmap + group)
++ * + change two blocks at each level, but root (already included)
+ */
-+ needed += (depth * EXT3_ALLOC_NEEDED) + (2 * depth) + 1;
++ needed += (depth * 2) + (depth * 2);
++
++ /* any allocation modifies superblock */
++ needed += 1;
+
+ return needed;
+}
+
-+static int
-+ext3_ext_split_for_rm(handle_t *handle, struct ext3_extents_tree *tree,
-+ struct ext3_ext_path *path, unsigned long start,
-+ unsigned long end)
++static int ext3_remove_blocks(handle_t *handle, struct inode *inode,
++ struct ext3_extent *ex,
++ unsigned long from, unsigned long to)
+{
-+ struct ext3_extent *ex, tex;
-+ struct ext3_ext_path *npath;
-+ int depth, creds, err;
++ struct buffer_head *bh;
++ int i;
+
-+ depth = EXT_DEPTH(tree);
-+ ex = path[depth].p_ext;
-+ EXT_ASSERT(ex);
-+ EXT_ASSERT(end < ex->ee_block + ex->ee_len - 1);
-+ EXT_ASSERT(ex->ee_block < start);
++#ifdef EXTENTS_STATS
++ {
++ struct ext3_sb_info *sbi = EXT3_SB(inode->i_sb);
++ unsigned short ee_len = le16_to_cpu(ex->ee_len);
++ spin_lock(&sbi->s_ext_stats_lock);
++ sbi->s_ext_blocks += ee_len;
++ sbi->s_ext_extents++;
++ if (ee_len < sbi->s_ext_min)
++ sbi->s_ext_min = ee_len;
++ if (ee_len > sbi->s_ext_max)
++ sbi->s_ext_max = ee_len;
++ if (ext_depth(inode) > sbi->s_depth_max)
++ sbi->s_depth_max = ext_depth(inode);
++ spin_unlock(&sbi->s_ext_stats_lock);
++ }
++#endif
++ if (from >= le32_to_cpu(ex->ee_block)
++ && to == le32_to_cpu(ex->ee_block) + le16_to_cpu(ex->ee_len) - 1) {
++ /* tail removal */
++ unsigned long num, start;
++ num = le32_to_cpu(ex->ee_block) + le16_to_cpu(ex->ee_len) - from;
++ start = le32_to_cpu(ex->ee_start) + le16_to_cpu(ex->ee_len) - num;
++ ext_debug(inode, "free last %lu blocks starting %lu\n", num, start);
++ for (i = 0; i < num; i++) {
++ bh = sb_find_get_block(inode->i_sb, start + i);
++ ext3_forget(handle, 0, inode, bh, start + i);
++ }
++ ext3_free_blocks(handle, inode, start, num);
++ } else if (from == le32_to_cpu(ex->ee_block)
++ && to <= le32_to_cpu(ex->ee_block) + le16_to_cpu(ex->ee_len) - 1) {
++ printk("strange request: removal %lu-%lu from %u:%u\n",
++ from, to, le32_to_cpu(ex->ee_block), le16_to_cpu(ex->ee_len));
++ } else {
++ printk("strange request: removal(2) %lu-%lu from %u:%u\n",
++ from, to, le32_to_cpu(ex->ee_block), le16_to_cpu(ex->ee_len));
++ }
++ return 0;
++}
+
-+ /* calculate tail extent */
-+ tex.ee_block = end + 1;
-+ EXT_ASSERT(tex.ee_block < ex->ee_block + ex->ee_len);
-+ tex.ee_len = ex->ee_block + ex->ee_len - tex.ee_block;
++static int
++ext3_ext_rm_leaf(handle_t *handle, struct inode *inode,
++ struct ext3_ext_path *path, unsigned long start)
++{
++ int err = 0, correct_index = 0;
++ int depth = ext_depth(inode), credits;
++ struct ext3_extent_header *eh;
++ unsigned a, b, block, num;
++ unsigned long ex_ee_block;
++ unsigned short ex_ee_len;
++ struct ext3_extent *ex;
+
-+ creds = ext3_ext_calc_credits_for_insert(tree, path);
-+ handle = ext3_ext_journal_restart(handle, creds);
-+ if (IS_ERR(handle))
-+ return PTR_ERR(handle);
-+
-+ /* calculate head extent. use primary extent */
-+ err = ext3_ext_get_access(handle, tree, path + depth);
-+ if (err)
-+ return err;
-+ ex->ee_len = start - ex->ee_block;
-+ err = ext3_ext_dirty(handle, tree, path + depth);
-+ if (err)
-+ return err;
++ /* the header must be checked already in ext3_ext_remove_space() */
++ ext_debug(inode, "truncate since %lu in leaf\n", start);
++ if (!path[depth].p_hdr)
++ path[depth].p_hdr = ext_block_hdr(path[depth].p_bh);
++ eh = path[depth].p_hdr;
++ BUG_ON(eh == NULL);
+
-+ /* FIXME: some callback to free underlying resource
-+ * and correct ee_start? */
-+ ext_debug(tree, "split extent: head %u:%u, tail %u:%u\n",
-+ ex->ee_block, ex->ee_len, tex.ee_block, tex.ee_len);
++ /* find where to start removing */
++ ex = EXT_LAST_EXTENT(eh);
+
-+ npath = ext3_ext_find_extent(tree, ex->ee_block, NULL);
-+ if (IS_ERR(npath))
-+ return PTR_ERR(npath);
-+ depth = EXT_DEPTH(tree);
-+ EXT_ASSERT(npath[depth].p_ext->ee_block == ex->ee_block);
-+ EXT_ASSERT(npath[depth].p_ext->ee_len == ex->ee_len);
++ ex_ee_block = le32_to_cpu(ex->ee_block);
++ ex_ee_len = le16_to_cpu(ex->ee_len);
+
-+ err = ext3_ext_insert_extent(handle, tree, npath, &tex);
-+ ext3_ext_drop_refs(npath);
-+ kfree(npath);
++ while (ex >= EXT_FIRST_EXTENT(eh) &&
++ ex_ee_block + ex_ee_len > start) {
++ ext_debug(inode, "remove ext %lu:%u\n", ex_ee_block, ex_ee_len);
++ path[depth].p_ext = ex;
+
-+ return err;
-+}
++ a = ex_ee_block > start ? ex_ee_block : start;
++ b = ex_ee_block + ex_ee_len - 1 < EXT_MAX_BLOCK ?
++ ex_ee_block + ex_ee_len - 1 : EXT_MAX_BLOCK;
+
-+static int
-+ext3_ext_rm_leaf(handle_t *handle, struct ext3_extents_tree *tree,
-+ struct ext3_ext_path *path, unsigned long start,
-+ unsigned long end)
-+{
-+ struct ext3_extent *ex, *fu = NULL, *lu, *le;
-+ int err = 0, correct_index = 0;
-+ int depth = EXT_DEPTH(tree), credits;
-+ struct ext3_extent_header *eh;
-+ unsigned a, b, block, num;
-+
-+ ext_debug(tree, "remove [%lu:%lu] in leaf\n", start, end);
-+ if (!path[depth].p_hdr)
-+ path[depth].p_hdr = EXT_BLOCK_HDR(path[depth].p_bh);
-+ eh = path[depth].p_hdr;
-+ EXT_ASSERT(eh);
-+ EXT_ASSERT(eh->eh_entries <= eh->eh_max);
-+ EXT_ASSERT(eh->eh_magic == EXT3_EXT_MAGIC);
-+
-+ /* find where to start removing */
-+ le = ex = EXT_LAST_EXTENT(eh);
-+ while (ex != EXT_FIRST_EXTENT(eh)) {
-+ if (ex->ee_block <= end)
-+ break;
-+ ex--;
-+ }
++ ext_debug(inode, " border %u:%u\n", a, b);
+
-+ if (start > ex->ee_block && end < ex->ee_block + ex->ee_len - 1) {
-+ /* removal of internal part of the extent requested
-+ * tail and head must be placed in different extent
-+ * so, we have to insert one more extent */
-+ path[depth].p_ext = ex;
-+ return ext3_ext_split_for_rm(handle, tree, path, start, end);
-+ }
-+
-+ lu = ex;
-+ while (ex >= EXT_FIRST_EXTENT(eh) && ex->ee_block + ex->ee_len > start) {
-+ ext_debug(tree, "remove ext %u:%u\n", ex->ee_block, ex->ee_len);
-+ path[depth].p_ext = ex;
-+
-+ a = ex->ee_block > start ? ex->ee_block : start;
-+ b = ex->ee_block + ex->ee_len - 1 < end ?
-+ ex->ee_block + ex->ee_len - 1 : end;
-+
-+ ext_debug(tree, " border %u:%u\n", a, b);
-+
-+ if (a != ex->ee_block && b != ex->ee_block + ex->ee_len - 1) {
++ if (a != ex_ee_block && b != ex_ee_block + ex_ee_len - 1) {
+ block = 0;
+ num = 0;
+ BUG();
-+ } else if (a != ex->ee_block) {
++ } else if (a != ex_ee_block) {
+ /* remove tail of the extent */
-+ block = ex->ee_block;
++ block = ex_ee_block;
+ num = a - block;
-+ } else if (b != ex->ee_block + ex->ee_len - 1) {
++ } else if (b != ex_ee_block + ex_ee_len - 1) {
+ /* remove head of the extent */
+ block = a;
+ num = b - a;
++ /* there is no "make a hole" API yet */
++ BUG();
+ } else {
-+ /* remove whole extent: excelent! */
-+ block = ex->ee_block;
++ /* remove whole extent: excellent! */
++ block = ex_ee_block;
+ num = 0;
-+ EXT_ASSERT(a == ex->ee_block &&
-+ b == ex->ee_block + ex->ee_len - 1);
++ BUG_ON(a != ex_ee_block);
++ BUG_ON(b != ex_ee_block + ex_ee_len - 1);
+ }
+
-+ if (ex == EXT_FIRST_EXTENT(eh))
++ /* at present, extent can't cross block group */
++ /* leaf + bitmap + group desc + sb + inode */
++ credits = 5;
++ if (ex == EXT_FIRST_EXTENT(eh)) {
+ correct_index = 1;
++ credits += (ext_depth(inode)) + 1;
++ }
++#ifdef CONFIG_QUOTA
++ credits += 2 * EXT3_QUOTA_TRANS_BLOCKS(inode->i_sb);
++#endif
+
-+ credits = 1;
-+ if (correct_index)
-+ credits += (EXT_DEPTH(tree) * EXT3_ALLOC_NEEDED) + 1;
-+ if (tree->ops->remove_extent_credits)
-+ credits+=tree->ops->remove_extent_credits(tree,ex,a,b);
-+
+ handle = ext3_ext_journal_restart(handle, credits);
+ if (IS_ERR(handle)) {
+ err = PTR_ERR(handle);
+ goto out;
+ }
+
-+ err = ext3_ext_get_access(handle, tree, path + depth);
++ err = ext3_ext_get_access(handle, inode, path + depth);
+ if (err)
+ goto out;
+
-+ if (tree->ops->remove_extent)
-+ err = tree->ops->remove_extent(tree, ex, a, b);
++ err = ext3_remove_blocks(handle, inode, ex, a, b);
+ if (err)
+ goto out;
+
+ if (num == 0) {
+ /* this extent is removed entirely mark slot unused */
+ ex->ee_start = ex->ee_start_hi = 0;
-+ eh->eh_entries--;
-+ fu = ex;
++ eh->eh_entries = cpu_to_le16(le16_to_cpu(eh->eh_entries)-1);
+ }
+
-+ ex->ee_block = block;
-+ ex->ee_len = num;
++ ex->ee_block = cpu_to_le32(block);
++ ex->ee_len = cpu_to_le16(num);
+
-+ err = ext3_ext_dirty(handle, tree, path + depth);
++ err = ext3_ext_dirty(handle, inode, path + depth);
+ if (err)
+ goto out;
+
-+ ext_debug(tree, "new extent: %u:%u:%u\n",
-+ ex->ee_block, ex->ee_len, ex->ee_start);
++ ext_debug(inode, "new extent: %u:%u:%u\n", block, num,
++ le32_to_cpu(ex->ee_start));
+ ex--;
-+ }
-+
-+ if (fu) {
-+ /* reuse unused slots */
-+ while (lu < le) {
-+ if (lu->ee_start) {
-+ *fu = *lu;
-+ lu->ee_start = lu->ee_start_hi = 0;
-+ fu++;
-+ }
-+ lu++;
-+ }
++ ex_ee_block = le32_to_cpu(ex->ee_block);
++ ex_ee_len = le16_to_cpu(ex->ee_len);
+ }
+
+ if (correct_index && eh->eh_entries)
-+ err = ext3_ext_correct_indexes(handle, tree, path);
++ err = ext3_ext_correct_indexes(handle, inode, path);
+
+ /* if this leaf is free, then we should
+ * remove it from index block above */
+ if (err == 0 && eh->eh_entries == 0 && path[depth].p_bh != NULL)
-+ err = ext3_ext_rm_idx(handle, tree, path + depth);
++ err = ext3_ext_rm_idx(handle, inode, path + depth);
+
+out:
+ return err;
+}
+
-+
-+static struct ext3_extent_idx *
-+ext3_ext_last_covered(struct ext3_extent_header *hdr, unsigned long block)
-+{
-+ struct ext3_extent_idx *ix;
-+
-+ ix = EXT_LAST_INDEX(hdr);
-+ while (ix != EXT_FIRST_INDEX(hdr)) {
-+ if (ix->ei_block <= block)
-+ break;
-+ ix--;
-+ }
-+ return ix;
-+}
-+
+/*
+ * returns 1 if current index have to be freed (even partial)
+ */
+static int inline
+ext3_ext_more_to_rm(struct ext3_ext_path *path)
+{
-+ EXT_ASSERT(path->p_idx);
++ BUG_ON(path->p_idx == NULL);
+
+ if (path->p_idx < EXT_FIRST_INDEX(path->p_hdr))
+ return 0;
@@ -1699,91 +1868,100 @@ Index: linux-stage/fs/ext3/extents.c
+ * if truncate on deeper level happened it it wasn't partial
+ * so we have to consider current index for truncation
+ */
-+ if (path->p_hdr->eh_entries == path->p_block)
++ if (le16_to_cpu(path->p_hdr->eh_entries) == path->p_block)
+ return 0;
+ return 1;
+}
+
-+int ext3_ext_remove_space(struct ext3_extents_tree *tree,
-+ unsigned long start, unsigned long end)
++int ext3_ext_remove_space(struct inode *inode, unsigned long start)
+{
-+ struct inode *inode = tree->inode;
+ struct super_block *sb = inode->i_sb;
-+ int depth = EXT_DEPTH(tree);
++ int depth = ext_depth(inode);
+ struct ext3_ext_path *path;
+ handle_t *handle;
+ int i = 0, err = 0;
+
-+ ext_debug(tree, "space to be removed: %lu:%lu\n", start, end);
++ ext_debug(inode, "truncate since %lu\n", start);
+
+ /* probably first extent we're gonna free will be last in block */
+ handle = ext3_journal_start(inode, depth + 1);
+ if (IS_ERR(handle))
+ return PTR_ERR(handle);
+
-+ ext3_ext_invalidate_cache(tree);
++ ext3_ext_invalidate_cache(inode);
+
+ /*
+ * we start scanning from right side freeing all the blocks
+ * after i_size and walking into the deep
+ */
+ path = kmalloc(sizeof(struct ext3_ext_path) * (depth + 1), GFP_KERNEL);
-+ if (IS_ERR(path)) {
-+ ext3_error(sb, __FUNCTION__, "Can't allocate path array");
++ if (path == NULL) {
+ ext3_journal_stop(handle);
+ return -ENOMEM;
+ }
+ memset(path, 0, sizeof(struct ext3_ext_path) * (depth + 1));
-+ path[i].p_hdr = EXT_ROOT_HDR(tree);
-+
++ path[0].p_hdr = ext_inode_hdr(inode);
++ if (ext3_ext_check_header(inode, path[0].p_hdr, depth)) {
++ err = -EIO;
++ goto out;
++ }
++ path[0].p_depth = depth;
++
+ while (i >= 0 && err == 0) {
+ if (i == depth) {
+ /* this is leaf block */
-+ err = ext3_ext_rm_leaf(handle, tree, path, start, end);
++ err = ext3_ext_rm_leaf(handle, inode, path, start);
+ /* root level have p_bh == NULL, brelse() eats this */
+ brelse(path[i].p_bh);
++ path[i].p_bh = NULL;
+ i--;
+ continue;
+ }
-+
++
+ /* this is index block */
+ if (!path[i].p_hdr) {
-+ ext_debug(tree, "initialize header\n");
-+ path[i].p_hdr = EXT_BLOCK_HDR(path[i].p_bh);
++ ext_debug(inode, "initialize header\n");
++ path[i].p_hdr = ext_block_hdr(path[i].p_bh);
+ }
+
-+ EXT_ASSERT(path[i].p_hdr->eh_entries <= path[i].p_hdr->eh_max);
-+ EXT_ASSERT(path[i].p_hdr->eh_magic == EXT3_EXT_MAGIC);
-+
+ if (!path[i].p_idx) {
+ /* this level hasn't touched yet */
-+ path[i].p_idx =
-+ ext3_ext_last_covered(path[i].p_hdr, end);
-+ path[i].p_block = path[i].p_hdr->eh_entries + 1;
-+ ext_debug(tree, "init index ptr: hdr 0x%p, num %d\n",
-+ path[i].p_hdr, path[i].p_hdr->eh_entries);
++ path[i].p_idx = EXT_LAST_INDEX(path[i].p_hdr);
++ path[i].p_block = le16_to_cpu(path[i].p_hdr->eh_entries)+1;
++ ext_debug(inode, "init index ptr: hdr 0x%p, num %d\n",
++ path[i].p_hdr,
++ le16_to_cpu(path[i].p_hdr->eh_entries));
+ } else {
+ /* we've already was here, see at next index */
+ path[i].p_idx--;
+ }
+
-+ ext_debug(tree, "level %d - index, first 0x%p, cur 0x%p\n",
-+ i, EXT_FIRST_INDEX(path[i].p_hdr),
-+ path[i].p_idx);
++ ext_debug(inode, "level %d - index, first 0x%p, cur 0x%p\n",
++ i, EXT_FIRST_INDEX(path[i].p_hdr),
++ path[i].p_idx);
+ if (ext3_ext_more_to_rm(path + i)) {
++ struct buffer_head *bh;
+ /* go to the next level */
-+ ext_debug(tree, "move to level %d (block %d)\n",
-+ i + 1, path[i].p_idx->ei_leaf);
++ ext_debug(inode, "move to level %d (block %d)\n",
++ i + 1, le32_to_cpu(path[i].p_idx->ei_leaf));
+ memset(path + i + 1, 0, sizeof(*path));
-+ path[i+1].p_bh = sb_bread(sb, path[i].p_idx->ei_leaf);
-+ if (!path[i+1].p_bh) {
++ bh = sb_bread(sb, le32_to_cpu(path[i].p_idx->ei_leaf));
++ if (!bh) {
+ /* should we reset i_size? */
+ err = -EIO;
+ break;
+ }
++ BUG_ON(i + 1 > depth);
++ if (ext3_ext_check_header(inode, ext_block_hdr(bh),
++ depth - i - 1)) {
++ err = -EIO;
++ break;
++ }
++ path[i+1].p_bh = bh;
++
+ /* put actual number of indexes to know is this
+ * number got changed at the next iteration */
-+ path[i].p_block = path[i].p_hdr->eh_entries;
++ path[i].p_block = le16_to_cpu(path[i].p_hdr->eh_entries);
+ i++;
+ } else {
+ /* we finish processing this index, go up */
@@ -1791,12 +1969,13 @@ Index: linux-stage/fs/ext3/extents.c
+ /* index is empty, remove it
+ * handle must be already prepared by the
+ * truncatei_leaf() */
-+ err = ext3_ext_rm_idx(handle, tree, path + i);
++ err = ext3_ext_rm_idx(handle, inode, path + i);
+ }
+ /* root level have p_bh == NULL, brelse() eats this */
+ brelse(path[i].p_bh);
++ path[i].p_bh = NULL;
+ i--;
-+ ext_debug(tree, "return to level %d\n", i);
++ ext_debug(inode, "return to level %d\n", i);
+ }
+ }
+
@@ -1806,51 +1985,23 @@ Index: linux-stage/fs/ext3/extents.c
+ * truncate to zero freed all the tree
+ * so, we need to correct eh_depth
+ */
-+ err = ext3_ext_get_access(handle, tree, path);
++ err = ext3_ext_get_access(handle, inode, path);
+ if (err == 0) {
-+ EXT_ROOT_HDR(tree)->eh_depth = 0;
-+ EXT_ROOT_HDR(tree)->eh_max = ext3_ext_space_root(tree);
-+ err = ext3_ext_dirty(handle, tree, path);
++ ext_inode_hdr(inode)->eh_depth = 0;
++ ext_inode_hdr(inode)->eh_max =
++ cpu_to_le16(ext3_ext_space_root(inode));
++ err = ext3_ext_dirty(handle, inode, path);
+ }
+ }
-+ ext3_ext_tree_changed(tree);
-+
++out:
++ ext3_ext_tree_changed(inode);
++ ext3_ext_drop_refs(path);
+ kfree(path);
+ ext3_journal_stop(handle);
+
+ return err;
+}
+
-+int ext3_ext_calc_metadata_amount(struct ext3_extents_tree *tree, int blocks)
-+{
-+ int lcap, icap, rcap, leafs, idxs, num;
-+
-+ rcap = ext3_ext_space_root(tree);
-+ if (blocks <= rcap) {
-+ /* all extents fit to the root */
-+ return 0;
-+ }
-+
-+ rcap = ext3_ext_space_root_idx(tree);
-+ lcap = ext3_ext_space_block(tree);
-+ icap = ext3_ext_space_block_idx(tree);
-+
-+ num = leafs = (blocks + lcap - 1) / lcap;
-+ if (leafs <= rcap) {
-+ /* all pointers to leafs fit to the root */
-+ return leafs;
-+ }
-+
-+ /* ok. we need separate index block(s) to link all leaf blocks */
-+ idxs = (leafs + icap - 1) / icap;
-+ do {
-+ num += idxs;
-+ idxs = (idxs + icap - 1) / icap;
-+ } while (idxs > rcap);
-+
-+ return num;
-+}
-+
+/*
+ * called at mount time
+ */
@@ -1868,7 +2019,15 @@ Index: linux-stage/fs/ext3/extents.c
+#ifdef CHECK_BINSEARCH
+ printk(", check binsearch");
+#endif
++#ifdef EXTENTS_STATS
++ printk(", stats");
++#endif
+ printk("\n");
++#ifdef EXTENTS_STATS
++ spin_lock_init(&EXT3_SB(sb)->s_ext_stats_lock);
++ EXT3_SB(sb)->s_ext_min = 1 << 30;
++ EXT3_SB(sb)->s_ext_max = 0;
++#endif
+ }
+}
+
@@ -1877,182 +2036,38 @@ Index: linux-stage/fs/ext3/extents.c
+ */
+void ext3_ext_release(struct super_block *sb)
+{
-+}
-+
-+/************************************************************************
-+ * VFS related routines
-+ ************************************************************************/
-+
-+static int ext3_get_inode_write_access(handle_t *handle, void *buffer)
-+{
-+ /* we use in-core data, not bh */
-+ return 0;
-+}
-+
-+static int ext3_mark_buffer_dirty(handle_t *handle, void *buffer)
-+{
-+ struct inode *inode = buffer;
-+ return ext3_mark_inode_dirty(handle, inode);
-+}
-+
-+static int ext3_ext_mergable(struct ext3_extent *ex1,
-+ struct ext3_extent *ex2)
-+{
-+ /* FIXME: support for large fs */
-+ if (ex1->ee_start + ex1->ee_len == ex2->ee_start)
-+ return 1;
-+ return 0;
-+}
-+
-+static int
-+ext3_remove_blocks_credits(struct ext3_extents_tree *tree,
-+ struct ext3_extent *ex,
-+ unsigned long from, unsigned long to)
-+{
-+ int needed;
-+
-+ /* at present, extent can't cross block group */;
-+ needed = 4; /* bitmap + group desc + sb + inode */
-+
-+#ifdef CONFIG_QUOTA
-+ needed += 2 * EXT3_SINGLEDATA_TRANS_BLOCKS;
-+#endif
-+ return needed;
-+}
-+
-+static int
-+ext3_remove_blocks(struct ext3_extents_tree *tree,
-+ struct ext3_extent *ex,
-+ unsigned long from, unsigned long to)
-+{
-+ int needed = ext3_remove_blocks_credits(tree, ex, from, to);
-+ handle_t *handle = ext3_journal_start(tree->inode, needed);
-+ struct buffer_head *bh;
-+ int i;
-+
-+ if (IS_ERR(handle))
-+ return PTR_ERR(handle);
-+ if (from >= ex->ee_block && to == ex->ee_block + ex->ee_len - 1) {
-+ /* tail removal */
-+ unsigned long num, start;
-+ num = ex->ee_block + ex->ee_len - from;
-+ start = ex->ee_start + ex->ee_len - num;
-+ ext_debug(tree, "free last %lu blocks starting %lu\n",
-+ num, start);
-+ for (i = 0; i < num; i++) {
-+ bh = sb_find_get_block(tree->inode->i_sb, start + i);
-+ ext3_forget(handle, 0, tree->inode, bh, start + i);
-+ }
-+ ext3_free_blocks(handle, tree->inode, start, num);
-+ } else if (from == ex->ee_block && to <= ex->ee_block + ex->ee_len - 1) {
-+ printk("strange request: removal %lu-%lu from %u:%u\n",
-+ from, to, ex->ee_block, ex->ee_len);
-+ } else {
-+ printk("strange request: removal(2) %lu-%lu from %u:%u\n",
-+ from, to, ex->ee_block, ex->ee_len);
-+ }
-+ ext3_journal_stop(handle);
-+ return 0;
-+}
-+
-+static int ext3_ext_find_goal(struct inode *inode,
-+ struct ext3_ext_path *path, unsigned long block)
-+{
-+ struct ext3_inode_info *ei = EXT3_I(inode);
-+ unsigned long bg_start;
-+ unsigned long colour;
-+ int depth;
-+
-+ if (path) {
-+ struct ext3_extent *ex;
-+ depth = path->p_depth;
-+
-+ /* try to predict block placement */
-+ if ((ex = path[depth].p_ext))
-+ return ex->ee_start + (block - ex->ee_block);
-+
-+ /* it looks index is empty
-+ * try to find starting from index itself */
-+ if (path[depth].p_bh)
-+ return path[depth].p_bh->b_blocknr;
-+ }
-+
-+ /* OK. use inode's group */
-+ bg_start = (ei->i_block_group * EXT3_BLOCKS_PER_GROUP(inode->i_sb)) +
-+ le32_to_cpu(EXT3_SB(inode->i_sb)->s_es->s_first_data_block);
-+ colour = (current->pid % 16) *
-+ (EXT3_BLOCKS_PER_GROUP(inode->i_sb) / 16);
-+ return bg_start + colour + block;
-+}
++ if (!test_opt(sb, EXTENTS))
++ return;
+
-+static int ext3_new_block_cb(handle_t *handle, struct ext3_extents_tree *tree,
-+ struct ext3_ext_path *path,
-+ struct ext3_extent *ex, int *err)
-+{
-+ struct inode *inode = tree->inode;
-+ int newblock, goal;
-+
-+ EXT_ASSERT(path);
-+ EXT_ASSERT(ex);
-+ EXT_ASSERT(ex->ee_start);
-+ EXT_ASSERT(ex->ee_len);
-+
-+ /* reuse block from the extent to order data/metadata */
-+ newblock = ex->ee_start++;
-+ ex->ee_len--;
-+ if (ex->ee_len == 0) {
-+ ex->ee_len = 1;
-+ /* allocate new block for the extent */
-+ goal = ext3_ext_find_goal(inode, path, ex->ee_block);
-+ ex->ee_start = ext3_new_block(handle, inode, goal, err);
-+ ex->ee_start_hi = 0;
-+ if (ex->ee_start == 0) {
-+ /* error occured: restore old extent */
-+ ex->ee_start = newblock;
-+ return 0;
-+ }
++#ifdef EXTENTS_STATS
++ if (EXT3_SB(sb)->s_ext_blocks && EXT3_SB(sb)->s_ext_extents) {
++ struct ext3_sb_info *sbi = EXT3_SB(sb);
++ printk(KERN_ERR "EXT3-fs: %lu blocks in %lu extents (%lu ave)\n",
++ sbi->s_ext_blocks, sbi->s_ext_extents,
++ sbi->s_ext_blocks / sbi->s_ext_extents);
++ printk(KERN_ERR "EXT3-fs: extents: %lu min, %lu max, max depth %lu\n",
++ sbi->s_ext_min, sbi->s_ext_max, sbi->s_depth_max);
+ }
-+ return newblock;
-+}
-+
-+static struct ext3_extents_helpers ext3_blockmap_helpers = {
-+ .get_write_access = ext3_get_inode_write_access,
-+ .mark_buffer_dirty = ext3_mark_buffer_dirty,
-+ .mergable = ext3_ext_mergable,
-+ .new_block = ext3_new_block_cb,
-+ .remove_extent = ext3_remove_blocks,
-+ .remove_extent_credits = ext3_remove_blocks_credits,
-+};
-+
-+void ext3_init_tree_desc(struct ext3_extents_tree *tree,
-+ struct inode *inode)
-+{
-+ tree->inode = inode;
-+ tree->root = (void *) EXT3_I(inode)->i_data;
-+ tree->buffer = (void *) inode;
-+ tree->buffer_len = sizeof(EXT3_I(inode)->i_data);
-+ tree->cex = (struct ext3_ext_cache *) &EXT3_I(inode)->i_cached_extent;
-+ tree->ops = &ext3_blockmap_helpers;
++#endif
+}
+
-+int ext3_ext_get_block(handle_t *handle, struct inode *inode,
-+ long iblock, struct buffer_head *bh_result,
-+ int create, int extend_disksize)
++int ext3_ext_get_blocks(handle_t *handle, struct inode *inode, sector_t iblock,
++ unsigned long max_blocks, struct buffer_head *bh_result,
++ int create, int extend_disksize)
+{
+ struct ext3_ext_path *path = NULL;
-+ struct ext3_extent newex;
-+ struct ext3_extent *ex;
++ struct ext3_extent newex, *ex;
+ int goal, newblock, err = 0, depth;
-+ struct ext3_extents_tree tree;
++ unsigned long allocated = 0;
++ unsigned long next;
+
-+ clear_buffer_new(bh_result);
-+ ext3_init_tree_desc(&tree, inode);
-+ ext_debug(&tree, "block %d requested for inode %u\n",
-+ (int) iblock, (unsigned) inode->i_ino);
++ __clear_bit(BH_New, &bh_result->b_state);
++ ext_debug(inode, "blocks %d/%lu requested for inode %u\n", (int) iblock,
++ max_blocks, (unsigned) inode->i_ino);
+ mutex_lock(&EXT3_I(inode)->truncate_mutex);
+
+ /* check in cache */
-+ if ((goal = ext3_ext_in_cache(&tree, iblock, &newex))) {
++ if ((goal = ext3_ext_in_cache(inode, iblock, &newex))) {
+ if (goal == EXT3_EXT_CACHE_GAP) {
+ if (!create) {
+ /* block isn't allocated yet and
@@ -2062,83 +2077,117 @@ Index: linux-stage/fs/ext3/extents.c
+ /* we should allocate requested block */
+ } else if (goal == EXT3_EXT_CACHE_EXTENT) {
+ /* block is already allocated */
-+ newblock = iblock - newex.ee_block + newex.ee_start;
++ newblock = iblock
++ - le32_to_cpu(newex.ee_block)
++ + le32_to_cpu(newex.ee_start);
++ /* number of remain blocks in the extent */
++ BUG_ON(iblock < le32_to_cpu(newex.ee_block));
++ allocated = le16_to_cpu(newex.ee_len) -
++ (iblock - le32_to_cpu(newex.ee_block));
+ goto out;
+ } else {
-+ EXT_ASSERT(0);
++ BUG();
+ }
+ }
+
+ /* find extent for this block */
-+ path = ext3_ext_find_extent(&tree, iblock, NULL);
++ path = ext3_ext_find_extent(inode, iblock, NULL);
+ if (IS_ERR(path)) {
+ err = PTR_ERR(path);
+ path = NULL;
+ goto out2;
+ }
+
-+ depth = EXT_DEPTH(&tree);
++ depth = ext_depth(inode);
+
+ /*
+ * consistent leaf must not be empty
+ * this situations is possible, though, _during_ tree modification
+ * this is why assert can't be put in ext3_ext_find_extent()
+ */
-+ EXT_ASSERT(path[depth].p_ext != NULL || depth == 0);
++ BUG_ON(path[depth].p_ext == NULL && depth != 0);
+
+ if ((ex = path[depth].p_ext)) {
++ unsigned long ee_block = le32_to_cpu(ex->ee_block);
++ unsigned long ee_start = le32_to_cpu(ex->ee_start);
++ unsigned short ee_len = le16_to_cpu(ex->ee_len);
+ /* if found exent covers block, simple return it */
-+ if (iblock >= ex->ee_block && iblock < ex->ee_block + ex->ee_len) {
-+ newblock = iblock - ex->ee_block + ex->ee_start;
-+ ext_debug(&tree, "%d fit into %d:%d -> %d\n",
-+ (int) iblock, ex->ee_block, ex->ee_len,
-+ newblock);
-+ ext3_ext_put_in_cache(&tree, ex->ee_block,
-+ ex->ee_len, ex->ee_start,
-+ EXT3_EXT_CACHE_EXTENT);
++ if (iblock >= ee_block && iblock < ee_block + ee_len) {
++ newblock = iblock - ee_block + ee_start;
++ /* number of remain blocks in the extent */
++ allocated = ee_len - (iblock - ee_block);
++ ext_debug(inode, "%d fit into %lu:%d -> %d\n", (int) iblock,
++ ee_block, ee_len, newblock);
++ ext3_ext_put_in_cache(inode, ee_block, ee_len,
++ ee_start, EXT3_EXT_CACHE_EXTENT);
+ goto out;
+ }
+ }
+
+ /*
+ * requested block isn't allocated yet
-+ * we couldn't try to create block if create flag is zero
++ * we couldn't try to create block if create flag is zero
+ */
+ if (!create) {
+ /* put just found gap into cache to speedup subsequest reqs */
-+ ext3_ext_put_gap_in_cache(&tree, path, iblock);
++ ext3_ext_put_gap_in_cache(inode, path, iblock);
+ goto out2;
+ }
+
++ /*
++ * Okay, we need to do block allocation. Lazily initialize the block
++ * allocation info here if necessary
++ */
++ if (S_ISREG(inode->i_mode) && (!EXT3_I(inode)->i_block_alloc_info))
++ ext3_init_block_alloc_info(inode);
++
++ /* find next allocated block so that we know how many
++ * blocks we can allocate without ovelapping next extent */
++ BUG_ON(iblock < le32_to_cpu(ex->ee_block) + le16_to_cpu(ex->ee_len));
++ next = ext3_ext_next_allocated_block(path);
++ BUG_ON(next <= iblock);
++ allocated = next - iblock;
++ if (allocated > max_blocks)
++ allocated = max_blocks;
++
+ /* allocate new block */
+ goal = ext3_ext_find_goal(inode, path, iblock);
-+ newblock = ext3_new_block(handle, inode, goal, &err);
++ newblock = ext3_new_blocks(handle, inode, goal, &allocated, &err);
+ if (!newblock)
+ goto out2;
-+ ext_debug(&tree, "allocate new block: goal %d, found %d\n",
-+ goal, newblock);
++ ext_debug(inode, "allocate new block: goal %d, found %d/%lu\n",
++ goal, newblock, allocated);
+
+ /* try to insert new extent into found leaf and return */
-+ newex.ee_block = iblock;
-+ newex.ee_start = newblock;
++ newex.ee_block = cpu_to_le32(iblock);
++ newex.ee_start = cpu_to_le32(newblock);
+ newex.ee_start_hi = 0;
-+ newex.ee_len = 1;
-+ err = ext3_ext_insert_extent(handle, &tree, path, &newex);
-+ if (err)
++ newex.ee_len = cpu_to_le16(allocated);
++ err = ext3_ext_insert_extent(handle, inode, path, &newex);
++ if (err) {
++ /* free data blocks we just allocated */
++ ext3_free_blocks(handle, inode, le32_to_cpu(newex.ee_start),
++ le16_to_cpu(newex.ee_len));
+ goto out2;
-+
++ }
++
+ if (extend_disksize && inode->i_size > EXT3_I(inode)->i_disksize)
+ EXT3_I(inode)->i_disksize = inode->i_size;
+
+ /* previous routine could use block we allocated */
-+ newblock = newex.ee_start;
-+ set_buffer_new(bh_result);
++ newblock = le32_to_cpu(newex.ee_start);
++ __set_bit(BH_New, &bh_result->b_state);
+
-+ ext3_ext_put_in_cache(&tree, newex.ee_block, newex.ee_len,
-+ newex.ee_start, EXT3_EXT_CACHE_EXTENT);
++ ext3_ext_put_in_cache(inode, iblock, allocated, newblock,
++ EXT3_EXT_CACHE_EXTENT);
+out:
-+ ext3_ext_show_leaf(&tree, path);
-+ map_bh(bh_result, inode->i_sb, newblock);
++ if (allocated > max_blocks)
++ allocated = max_blocks;
++ ext3_ext_show_leaf(inode, path);
++ __set_bit(BH_Mapped, &bh_result->b_state);
++ bh_result->b_bdev = inode->i_sb->s_bdev;
++ bh_result->b_blocknr = newblock;
++ bh_result->b_size = (allocated << inode->i_blkbits);
+out2:
+ if (path) {
+ ext3_ext_drop_refs(path);
@@ -2146,20 +2195,17 @@ Index: linux-stage/fs/ext3/extents.c
+ }
+ mutex_unlock(&EXT3_I(inode)->truncate_mutex);
+
-+ return err;
++ return err ? err : allocated;
+}
+
+void ext3_ext_truncate(struct inode * inode, struct page *page)
+{
+ struct address_space *mapping = inode->i_mapping;
+ struct super_block *sb = inode->i_sb;
-+ struct ext3_extents_tree tree;
+ unsigned long last_block;
+ handle_t *handle;
+ int err = 0;
+
-+ ext3_init_tree_desc(&tree, inode);
-+
+ /*
+ * probably first extent we're gonna free will be last in block
+ */
@@ -2179,9 +2225,9 @@ Index: linux-stage/fs/ext3/extents.c
+ ext3_block_truncate_page(handle, page, mapping, inode->i_size);
+
+ mutex_lock(&EXT3_I(inode)->truncate_mutex);
-+ ext3_ext_invalidate_cache(&tree);
++ ext3_ext_invalidate_cache(inode);
+
-+ /*
++ /*
+ * TODO: optimization is possible here
+ * probably we need not scaning at all,
+ * because page truncation is enough
@@ -2193,10 +2239,10 @@ Index: linux-stage/fs/ext3/extents.c
+ EXT3_I(inode)->i_disksize = inode->i_size;
+ ext3_mark_inode_dirty(handle, inode);
+
-+ last_block = (inode->i_size + sb->s_blocksize - 1) >>
-+ EXT3_BLOCK_SIZE_BITS(sb);
-+ err = ext3_ext_remove_space(&tree, last_block, EXT_MAX_BLOCK);
-+
++ last_block = (inode->i_size + sb->s_blocksize - 1)
++ >> EXT3_BLOCK_SIZE_BITS(sb);
++ err = ext3_ext_remove_space(inode, last_block);
++
+ /* In a multi-transaction truncate, we only make the final
+ * transaction synchronous */
+ if (IS_SYNC(inode))
@@ -2223,165 +2269,37 @@ Index: linux-stage/fs/ext3/extents.c
+ */
+int ext3_ext_writepage_trans_blocks(struct inode *inode, int num)
+{
-+ struct ext3_extents_tree tree;
+ int needed;
-+
-+ ext3_init_tree_desc(&tree, inode);
-+
-+ needed = ext3_ext_calc_credits_for_insert(&tree, NULL);
-+
-+ /* caller want to allocate num blocks */
-+ needed *= num;
-+
-+#ifdef CONFIG_QUOTA
-+ /*
-+ * FIXME: real calculation should be here
-+ * it depends on blockmap format of qouta file
-+ */
-+ needed += 2 * EXT3_SINGLEDATA_TRANS_BLOCKS;
-+#endif
-+
-+ return needed;
-+}
-+
-+void ext3_extents_initialize_blockmap(handle_t *handle, struct inode *inode)
-+{
-+ struct ext3_extents_tree tree;
+
-+ ext3_init_tree_desc(&tree, inode);
-+ ext3_extent_tree_init(handle, &tree);
-+}
-+
-+int ext3_ext_calc_blockmap_metadata(struct inode *inode, int blocks)
-+{
-+ struct ext3_extents_tree tree;
++ needed = ext3_ext_calc_credits_for_insert(inode, NULL);
+
-+ ext3_init_tree_desc(&tree, inode);
-+ return ext3_ext_calc_metadata_amount(&tree, blocks);
-+}
-+
-+static int
-+ext3_ext_store_extent_cb(struct ext3_extents_tree *tree,
-+ struct ext3_ext_path *path,
-+ struct ext3_ext_cache *newex)
-+{
-+ struct ext3_extent_buf *buf = (struct ext3_extent_buf *) tree->private;
++ /* caller want to allocate num blocks, but note it includes sb */
++ needed = needed * num - (num - 1);
+
-+ if (newex->ec_type != EXT3_EXT_CACHE_EXTENT)
-+ return EXT_CONTINUE;
-+
-+ if (buf->err < 0)
-+ return EXT_BREAK;
-+ if (buf->cur - buf->buffer + sizeof(*newex) > buf->buflen)
-+ return EXT_BREAK;
-+
-+ if (!copy_to_user(buf->cur, newex, sizeof(*newex))) {
-+ buf->err++;
-+ buf->cur += sizeof(*newex);
-+ } else {
-+ buf->err = -EFAULT;
-+ return EXT_BREAK;
-+ }
-+ return EXT_CONTINUE;
-+}
-+
-+static int
-+ext3_ext_collect_stats_cb(struct ext3_extents_tree *tree,
-+ struct ext3_ext_path *path,
-+ struct ext3_ext_cache *ex)
-+{
-+ struct ext3_extent_tree_stats *buf =
-+ (struct ext3_extent_tree_stats *) tree->private;
-+ int depth;
-+
-+ if (ex->ec_type != EXT3_EXT_CACHE_EXTENT)
-+ return EXT_CONTINUE;
-+
-+ depth = EXT_DEPTH(tree);
-+ buf->extents_num++;
-+ if (path[depth].p_ext == EXT_FIRST_EXTENT(path[depth].p_hdr))
-+ buf->leaf_num++;
-+ return EXT_CONTINUE;
-+}
-+
-+int ext3_ext_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
-+ unsigned long arg)
-+{
-+ int err = 0;
-+
-+ if (!(EXT3_I(inode)->i_flags & EXT3_EXTENTS_FL))
-+ return -EINVAL;
-+
-+ if (cmd == EXT3_IOC_GET_EXTENTS) {
-+ struct ext3_extent_buf buf;
-+ struct ext3_extents_tree tree;
-+
-+ if (copy_from_user(&buf, (void *) arg, sizeof(buf)))
-+ return -EFAULT;
-+
-+ ext3_init_tree_desc(&tree, inode);
-+ buf.cur = buf.buffer;
-+ buf.err = 0;
-+ tree.private = &buf;
-+ mutex_lock(&EXT3_I(inode)->truncate_mutex);
-+ err = ext3_ext_walk_space(&tree, buf.start, EXT_MAX_BLOCK,
-+ ext3_ext_store_extent_cb);
-+ mutex_unlock(&EXT3_I(inode)->truncate_mutex);
-+ if (err == 0)
-+ err = buf.err;
-+ } else if (cmd == EXT3_IOC_GET_TREE_STATS) {
-+ struct ext3_extent_tree_stats buf;
-+ struct ext3_extents_tree tree;
-+
-+ ext3_init_tree_desc(&tree, inode);
-+ mutex_lock(&EXT3_I(inode)->truncate_mutex);
-+ buf.depth = EXT_DEPTH(&tree);
-+ buf.extents_num = 0;
-+ buf.leaf_num = 0;
-+ tree.private = &buf;
-+ err = ext3_ext_walk_space(&tree, 0, EXT_MAX_BLOCK,
-+ ext3_ext_collect_stats_cb);
-+ mutex_unlock(&EXT3_I(inode)->truncate_mutex);
-+ if (!err)
-+ err = copy_to_user((void *) arg, &buf, sizeof(buf));
-+ } else if (cmd == EXT3_IOC_GET_TREE_DEPTH) {
-+ struct ext3_extents_tree tree;
-+ ext3_init_tree_desc(&tree, inode);
-+ mutex_lock(&EXT3_I(inode)->truncate_mutex);
-+ err = EXT_DEPTH(&tree);
-+ mutex_unlock(&EXT3_I(inode)->truncate_mutex);
-+ }
++#ifdef CONFIG_QUOTA
++ needed += 2 * EXT3_QUOTA_TRANS_BLOCKS(inode->i_sb);
++#endif
+
-+ return err;
++ return needed;
+}
+
-+EXPORT_SYMBOL(ext3_init_tree_desc);
+EXPORT_SYMBOL(ext3_mark_inode_dirty);
+EXPORT_SYMBOL(ext3_ext_invalidate_cache);
+EXPORT_SYMBOL(ext3_ext_insert_extent);
+EXPORT_SYMBOL(ext3_ext_walk_space);
+EXPORT_SYMBOL(ext3_ext_find_goal);
+EXPORT_SYMBOL(ext3_ext_calc_credits_for_insert);
-Index: linux-stage/fs/ext3/ialloc.c
+Index: linux-2.6.18.8/fs/ext3/ialloc.c
===================================================================
---- linux-stage.orig/fs/ext3/ialloc.c 2006-07-16 13:55:31.000000000 +0800
-+++ linux-stage/fs/ext3/ialloc.c 2006-07-16 14:10:20.000000000 +0800
-@@ -600,7 +600,7 @@ got:
- ei->i_dir_start_lookup = 0;
- ei->i_disksize = 0;
-
-- ei->i_flags = EXT3_I(dir)->i_flags & ~EXT3_INDEX_FL;
-+ ei->i_flags = EXT3_I(dir)->i_flags & ~(EXT3_INDEX_FL|EXT3_EXTENTS_FL);
- if (S_ISLNK(mode))
- ei->i_flags &= ~(EXT3_IMMUTABLE_FL|EXT3_APPEND_FL);
- /* dirsync only applies to directories */
-@@ -644,6 +644,18 @@ got:
- if (err)
+--- linux-2.6.18.8.orig/fs/ext3/ialloc.c 2007-07-17 09:18:09.000000000 +0200
++++ linux-2.6.18.8/fs/ext3/ialloc.c 2007-07-17 11:08:09.000000000 +0200
+@@ -652,6 +652,17 @@ got:
+ ext3_std_error(sb, err);
goto fail_free_drop;
-
+ }
+ if (test_opt(sb, EXTENTS) && S_ISREG(inode->i_mode)) {
+ EXT3_I(inode)->i_flags |= EXT3_EXTENTS_FL;
-+ ext3_extents_initialize_blockmap(handle, inode);
++ ext3_ext_tree_init(handle, inode);
+ if (!EXT3_HAS_INCOMPAT_FEATURE(sb, EXT3_FEATURE_INCOMPAT_EXTENTS)) {
+ err = ext3_journal_get_write_access(handle, EXT3_SB(sb)->s_sbh);
+ if (err) goto fail;
@@ -2390,62 +2308,55 @@ Index: linux-stage/fs/ext3/ialloc.c
+ err = ext3_journal_dirty_metadata(handle, EXT3_SB(sb)->s_sbh);
+ }
+ }
-+
- err = ext3_mark_inode_dirty(handle, inode);
- if (err) {
- ext3_std_error(sb, err);
-Index: linux-stage/fs/ext3/inode.c
+
+ ext3_debug("allocating inode %lu\n", inode->i_ino);
+ goto really_out;
+Index: linux-2.6.18.8/fs/ext3/inode.c
===================================================================
---- linux-stage.orig/fs/ext3/inode.c 2006-07-16 13:55:31.000000000 +0800
-+++ linux-stage/fs/ext3/inode.c 2006-07-16 14:11:28.000000000 +0800
-@@ -40,7 +40,7 @@
+--- linux-2.6.18.8.orig/fs/ext3/inode.c 2007-07-17 09:18:12.000000000 +0200
++++ linux-2.6.18.8/fs/ext3/inode.c 2007-07-17 11:08:11.000000000 +0200
+@@ -40,8 +40,6 @@
#include "iopen.h"
#include "acl.h"
-static int ext3_writepage_trans_blocks(struct inode *inode);
-+int ext3_writepage_trans_blocks(struct inode *inode);
-
+-
/*
* Test whether an inode is a fast symlink.
-@@ -944,6 +944,17 @@ out:
+ */
+@@ -804,6 +802,7 @@ int ext3_get_blocks_handle(handle_t *han
+ ext3_fsblk_t first_block = 0;
- #define DIO_CREDITS (EXT3_RESERVE_TRANS_BLOCKS + 32)
-+static inline int
-+ext3_get_block_wrap(handle_t *handle, struct inode *inode, long block,
-+ struct buffer_head *bh, int create, int extend_disksize)
-+{
-+ if (EXT3_I(inode)->i_flags & EXT3_EXTENTS_FL)
-+ return ext3_ext_get_block(handle, inode, block, bh, create,
-+ extend_disksize);
-+ return ext3_get_blocks_handle(handle, inode, block, 1, bh, create,
-+ extend_disksize);
-+}
-+
- static int ext3_get_block(struct inode *inode, sector_t iblock,
- struct buffer_head *bh_result, int create)
- {
-@@ -984,8 +995,8 @@ static int ext3_get_block(struct inode *
++ J_ASSERT(!(EXT3_I(inode)->i_flags & EXT3_EXTENTS_FL));
+ J_ASSERT(handle != NULL || create == 0);
+ depth = ext3_block_to_path(inode,iblock,offsets,&blocks_to_boundary);
+
+@@ -984,12 +983,10 @@ static int ext3_get_block(struct inode *
get_block:
if (ret == 0) {
- ret = ext3_get_blocks_handle(handle, inode, iblock,
-- max_blocks, bh_result, create, 0);
-+ ret = ext3_get_block_wrap(handle, inode, iblock,
-+ bh_result, create, 0);
- if (ret > 0) {
- bh_result->b_size = (ret << inode->i_blkbits);
++ ret = ext3_get_blocks_wrap(handle, inode, iblock,
+ max_blocks, bh_result, create, 0);
+- if (ret > 0) {
+- bh_result->b_size = (ret << inode->i_blkbits);
++ if (ret > 0)
ret = 0;
-@@ -1008,7 +1019,7 @@ struct buffer_head *ext3_getblk(handle_t
+- }
+ }
+ return ret;
+ }
+@@ -1008,7 +1005,7 @@ struct buffer_head *ext3_getblk(handle_t
dummy.b_state = 0;
dummy.b_blocknr = -1000;
buffer_trace_init(&dummy.b_history);
- err = ext3_get_blocks_handle(handle, inode, block, 1,
-+ err = ext3_get_block_wrap(handle, inode, block,
++ err = ext3_get_blocks_wrap(handle, inode, block, 1,
&dummy, create, 1);
- if (err == 1) {
- err = 0;
-@@ -1756,7 +1767,7 @@ void ext3_set_aops(struct inode *inode)
+ /*
+ * ext3_get_blocks_handle() returns number of blocks
+@@ -1759,7 +1756,7 @@ void ext3_set_aops(struct inode *inode)
* This required during truncate. We need to physically zero the tail end
* of that block so it doesn't yield old data if the file is later grown.
*/
@@ -2454,7 +2365,7 @@ Index: linux-stage/fs/ext3/inode.c
struct address_space *mapping, loff_t from)
{
ext3_fsblk_t index = from >> PAGE_CACHE_SHIFT;
-@@ -2260,6 +2271,9 @@ void ext3_truncate(struct inode *inode)
+@@ -2263,6 +2260,9 @@ void ext3_truncate(struct inode *inode)
return;
}
@@ -2464,7 +2375,7 @@ Index: linux-stage/fs/ext3/inode.c
handle = start_transaction(inode);
if (IS_ERR(handle)) {
if (page) {
-@@ -3004,12 +3018,15 @@ err_out:
+@@ -3008,12 +3008,15 @@ err_out:
* block and work out the exact number of indirects which are touched. Pah.
*/
@@ -2475,48 +2386,38 @@ Index: linux-stage/fs/ext3/inode.c
int indirects = (EXT3_NDIR_BLOCKS % bpp) ? 5 : 3;
int ret;
-+ if (EXT3_I(inode)->i_flags & EXT3_EXTENTS_FL)
-+ return ext3_ext_writepage_trans_blocks(inode, bpp);
++ if (EXT3_I(inode)->i_flags & EXT3_EXTENTS_FL)
++ return ext3_ext_writepage_trans_blocks(inode, bpp);
+
if (ext3_should_journal_data(inode))
ret = 3 * (bpp + indirects) + 2;
else
-@@ -3277,7 +3294,7 @@ int ext3_prep_san_write(struct inode *in
+@@ -3260,7 +3263,7 @@ int ext3_map_inode_page(struct inode *in
+ if (blocks[i] != 0)
+ continue;
- /* alloc blocks one by one */
- for (i = 0; i < nblocks; i++) {
-- ret = ext3_get_block_handle(handle, inode, blocks[i],
-+ ret = ext3_get_blocks_handle(handle, inode, blocks[i], 1,
- &bh_tmp, 1, 1);
- if (ret)
- break;
-@@ -3337,7 +3354,7 @@ int ext3_map_inode_page(struct inode *in
- if (blocks[i] != 0)
- continue;
-
-- rc = ext3_get_block_handle(handle, inode, iblock, &dummy, 1, 1);
-+ rc = ext3_get_blocks_handle(handle, inode, iblock, 1, &dummy, 1, 1);
- if (rc) {
- printk(KERN_INFO "ext3_map_inode_page: error reading "
- "block %ld\n", iblock);
-Index: linux-stage/fs/ext3/Makefile
+- rc = ext3_get_blocks_handle(handle, inode, iblock, 1, &dummy, 1, 1);
++ rc = ext3_get_blocks_wrap(handle, inode, iblock, 1, &dummy, 1, 1);
+ if (rc < 0) {
+ printk(KERN_INFO "ext3_map_inode_page: error reading "
+ "block %ld\n", iblock);
+Index: linux-2.6.18.8/fs/ext3/Makefile
===================================================================
---- linux-stage.orig/fs/ext3/Makefile 2006-07-16 13:55:31.000000000 +0800
-+++ linux-stage/fs/ext3/Makefile 2006-07-16 14:10:21.000000000 +0800
-@@ -5,7 +5,8 @@
+--- linux-2.6.18.8.orig/fs/ext3/Makefile 2007-07-17 09:18:11.000000000 +0200
++++ linux-2.6.18.8/fs/ext3/Makefile 2007-07-17 11:08:11.000000000 +0200
+@@ -5,7 +5,7 @@
obj-$(CONFIG_EXT3_FS) += ext3.o
ext3-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o iopen.o \
- ioctl.o namei.o super.o symlink.o hash.o resize.o
-+ ioctl.o namei.o super.o symlink.o hash.o resize.o \
-+ extents.o
++ ioctl.o namei.o super.o symlink.o hash.o resize.o extents.o
ext3-$(CONFIG_EXT3_FS_XATTR) += xattr.o xattr_user.o xattr_trusted.o
ext3-$(CONFIG_EXT3_FS_POSIX_ACL) += acl.o
-Index: linux-stage/fs/ext3/super.c
+Index: linux-2.6.18.8/fs/ext3/super.c
===================================================================
---- linux-stage.orig/fs/ext3/super.c 2006-07-16 13:55:31.000000000 +0800
-+++ linux-stage/fs/ext3/super.c 2006-07-16 14:10:21.000000000 +0800
+--- linux-2.6.18.8.orig/fs/ext3/super.c 2007-07-17 09:18:12.000000000 +0200
++++ linux-2.6.18.8/fs/ext3/super.c 2007-07-17 11:08:12.000000000 +0200
@@ -391,6 +391,7 @@ static void ext3_put_super (struct super
struct ext3_super_block *es = sbi->s_es;
int i;
@@ -2529,30 +2430,32 @@ Index: linux-stage/fs/ext3/super.c
#endif
ei->i_block_alloc_info = NULL;
ei->vfs_inode.i_version = 1;
-+
++
+ memset(&ei->i_cached_extent, 0, sizeof(ei->i_cached_extent));
return &ei->vfs_inode;
}
-@@ -638,6 +641,7 @@ enum {
+@@ -680,7 +683,8 @@ enum {
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota,
Opt_ignore, Opt_barrier, Opt_err, Opt_resize, Opt_usrquota,
Opt_iopen, Opt_noiopen, Opt_iopen_nopriv,
+- Opt_grpquota
++ Opt_grpquota,
+ Opt_extents, Opt_noextents, Opt_extdebug,
- Opt_grpquota
};
-@@ -690,6 +694,9 @@ static match_table_t tokens = {
- {Opt_iopen, "iopen"},
+ static match_table_t tokens = {
+@@ -733,6 +737,9 @@ static match_table_t tokens = {
{Opt_noiopen, "noiopen"},
{Opt_iopen_nopriv, "iopen_nopriv"},
+ {Opt_barrier, "barrier=%u"},
+ {Opt_extents, "extents"},
+ {Opt_noextents, "noextents"},
+ {Opt_extdebug, "extdebug"},
- {Opt_barrier, "barrier=%u"},
{Opt_err, NULL},
{Opt_resize, "resize"},
-@@ -1035,6 +1041,15 @@ clear_qf_name:
+ };
+@@ -1077,6 +1084,15 @@ clear_qf_name:
case Opt_bh:
clear_opt(sbi->s_mount_opt, NOBH);
break;
@@ -2568,113 +2471,22 @@ Index: linux-stage/fs/ext3/super.c
default:
printk (KERN_ERR
"EXT3-fs: Unrecognized mount option \"%s\" "
-@@ -1760,6 +1772,7 @@ static int ext3_fill_super (struct super
+@@ -1806,6 +1822,8 @@ static int ext3_fill_super (struct super
test_opt(sb,DATA_FLAGS) == EXT3_MOUNT_ORDERED_DATA ? "ordered":
"writeback");
+ ext3_ext_init(sb);
++
lock_kernel();
return 0;
-Index: linux-stage/fs/ext3/ioctl.c
-===================================================================
---- linux-stage.orig/fs/ext3/ioctl.c 2006-07-16 13:55:31.000000000 +0800
-+++ linux-stage/fs/ext3/ioctl.c 2006-07-16 13:55:31.000000000 +0800
-@@ -135,6 +135,10 @@ flags_err:
- mutex_unlock(&inode->i_mutex);
- return err;
- }
-+ case EXT3_IOC_GET_EXTENTS:
-+ case EXT3_IOC_GET_TREE_STATS:
-+ case EXT3_IOC_GET_TREE_DEPTH:
-+ return ext3_ext_ioctl(inode, filp, cmd, arg);
- case EXT3_IOC_GETVERSION:
- case EXT3_IOC_GETVERSION_OLD:
- return put_user(inode->i_generation, (int __user *) arg);
-Index: linux-stage/include/linux/ext3_fs.h
-===================================================================
---- linux-stage.orig/include/linux/ext3_fs.h 2006-07-16 13:55:31.000000000 +0800
-+++ linux-stage/include/linux/ext3_fs.h 2006-07-16 14:10:21.000000000 +0800
-@@ -181,9 +181,10 @@ struct ext3_group_desc
- #define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */
- #define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
- #define EXT3_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/
-+#define EXT3_EXTENTS_FL 0x00080000 /* Inode uses extents */
- #define EXT3_RESERVED_FL 0x80000000 /* reserved for ext3 lib */
-
--#define EXT3_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */
-+#define EXT3_FL_USER_VISIBLE 0x000BDFFF /* User visible flags */
- #define EXT3_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */
-
- /*
-@@ -233,6 +234,9 @@ struct ext3_new_group_data {
- #endif
- #define EXT3_IOC_GETRSVSZ _IOR('f', 5, long)
- #define EXT3_IOC_SETRSVSZ _IOW('f', 6, long)
-+#define EXT3_IOC_GET_EXTENTS _IOR('f', 7, long)
-+#define EXT3_IOC_GET_TREE_DEPTH _IOR('f', 8, long)
-+#define EXT3_IOC_GET_TREE_STATS _IOR('f', 9, long)
-
- /*
- * Mount options
-@@ -373,6 +377,8 @@ struct ext3_inode {
- #define EXT3_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
- #define EXT3_MOUNT_IOPEN 0x400000 /* Allow access via iopen */
- #define EXT3_MOUNT_IOPEN_NOPRIV 0x800000/* Make iopen world-readable */
-+#define EXT3_MOUNT_EXTENTS 0x1000000/* Extents support */
-+#define EXT3_MOUNT_EXTDEBUG 0x2000000/* Extents debug */
-
- /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
- #ifndef clear_opt
-@@ -563,11 +569,13 @@ static inline struct ext3_inode_info *EX
- #define EXT3_FEATURE_INCOMPAT_RECOVER 0x0004 /* Needs recovery */
- #define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV 0x0008 /* Journal device */
- #define EXT3_FEATURE_INCOMPAT_META_BG 0x0010
-+#define EXT3_FEATURE_INCOMPAT_EXTENTS 0x0040 /* extents support */
-
- #define EXT3_FEATURE_COMPAT_SUPP EXT2_FEATURE_COMPAT_EXT_ATTR
- #define EXT3_FEATURE_INCOMPAT_SUPP (EXT3_FEATURE_INCOMPAT_FILETYPE| \
- EXT3_FEATURE_INCOMPAT_RECOVER| \
-- EXT3_FEATURE_INCOMPAT_META_BG)
-+ EXT3_FEATURE_INCOMPAT_META_BG| \
-+ EXT3_FEATURE_INCOMPAT_EXTENTS)
- #define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
- EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
- EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
-@@ -787,6 +795,9 @@ extern unsigned long ext3_count_free (st
-
-
- /* inode.c */
-+extern int ext3_block_truncate_page(handle_t *, struct page *,
-+ struct address_space *, loff_t);
-+extern int ext3_writepage_trans_blocks(struct inode *inode);
- int ext3_forget(handle_t *handle, int is_metadata, struct inode *inode,
- struct buffer_head *bh, ext3_fsblk_t blocknr);
- struct buffer_head * ext3_getblk (handle_t *, struct inode *, long, int, int *);
-@@ -860,6 +870,16 @@ extern struct inode_operations ext3_spec
- extern struct inode_operations ext3_symlink_inode_operations;
- extern struct inode_operations ext3_fast_symlink_inode_operations;
-
-+/* extents.c */
-+extern int ext3_ext_writepage_trans_blocks(struct inode *, int);
-+extern int ext3_ext_get_block(handle_t *, struct inode *, long,
-+ struct buffer_head *, int, int);
-+extern void ext3_ext_truncate(struct inode *, struct page *);
-+extern void ext3_ext_init(struct super_block *);
-+extern void ext3_ext_release(struct super_block *);
-+extern void ext3_extents_initialize_blockmap(handle_t *, struct inode *);
-+extern int ext3_ext_ioctl(struct inode *inode, struct file *filp,
-+ unsigned int cmd, unsigned long arg);
-
- #endif /* __KERNEL__ */
-
-Index: linux-stage/include/linux/ext3_extents.h
+Index: linux-2.6.18.8/include/linux/ext3_extents.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-stage/include/linux/ext3_extents.h 2006-07-16 13:55:31.000000000 +0800
-@@ -0,0 +1,262 @@
++++ linux-2.6.18.8/include/linux/ext3_extents.h 2007-07-17 09:18:14.000000000 +0200
+@@ -0,0 +1,231 @@
+/*
-+ * Copyright (c) 2003, Cluster File Systems, Inc, info@clusterfs.com
++ * Copyright (c) 2003-2006, Cluster File Systems, Inc, info@clusterfs.com
+ * Written by Alex Tomas <alex@clusterfs.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
@@ -2694,6 +2506,8 @@ Index: linux-stage/include/linux/ext3_extents.h
+#ifndef _LINUX_EXT3_EXTENTS
+#define _LINUX_EXT3_EXTENTS
+
++#include <linux/ext3_fs.h>
++
+/*
+ * with AGRESSIVE_TEST defined capacity of index/leaf blocks
+ * become very little, so index split, in-depth growing and
@@ -2703,10 +2517,17 @@ Index: linux-stage/include/linux/ext3_extents.h
+#define AGRESSIVE_TEST_
+
+/*
++ * with EXTENTS_STATS defined number of blocks and extents
++ * are collected in truncate path. they'll be showed at
++ * umount time
++ */
++#define EXTENTS_STATS__
++
++/*
+ * if CHECK_BINSEARCH defined, then results of binary search
+ * will be checked by linear search
+ */
-+#define CHECK_BINSEARCH_
++#define CHECK_BINSEARCH__
+
+/*
+ * if EXT_DEBUG is defined you can use 'extdebug' mount option
@@ -2714,29 +2535,32 @@ Index: linux-stage/include/linux/ext3_extents.h
+ */
+#define EXT_DEBUG_
+#ifdef EXT_DEBUG
-+#define ext_debug(tree,fmt,a...) \
-+do { \
-+ if (test_opt((tree)->inode->i_sb, EXTDEBUG)) \
-+ printk(fmt, ##a); \
++#define ext_debug(inode,fmt,a...) \
++do { \
++ if (test_opt(inode->i_sb, EXTDEBUG)) \
++ printk(fmt, ##a); \
+} while (0);
+#else
-+#define ext_debug(tree,fmt,a...)
++#define ext_debug(inode,fmt,a...)
+#endif
+
++
+/*
+ * if EXT_STATS is defined then stats numbers are collected
+ * these number will be displayed at umount time
+ */
+#define EXT_STATS_
+
-+
-+#define EXT3_ALLOC_NEEDED 3 /* block bitmap + group desc. + sb */
++/*
++ * define EXT3_ALLOC_NEEDED to 0 since block bitmap, group desc. and sb
++ * are now accounted in ext3_ext_calc_credits_for_insert()
++ */
++#define EXT3_ALLOC_NEEDED 0
+
+/*
-+ * ext3_inode has i_block array (total 60 bytes)
-+ * first 4 bytes are used to store:
-+ * - tree depth (0 mean there is no tree yet. all extents in the inode)
-+ * - number of alive extents in the inode
++ * ext3_inode has i_block array (60 bytes total)
++ * first 12 bytes store ext3_extent_header
++ * the remain stores array of ext3_extent
+ */
+
+/*
@@ -2744,10 +2568,10 @@ Index: linux-stage/include/linux/ext3_extents.h
+ * it's used at the bottom of the tree
+ */
+struct ext3_extent {
-+ __u32 ee_block; /* first logical block extent covers */
-+ __u16 ee_len; /* number of blocks covered by extent */
-+ __u16 ee_start_hi; /* high 16 bits of physical block */
-+ __u32 ee_start; /* low 32 bigs of physical block */
++ __le32 ee_block; /* first logical block extent covers */
++ __le16 ee_len; /* number of blocks covered by extent */
++ __le16 ee_start_hi; /* high 16 bits of physical block */
++ __le32 ee_start; /* low 32 bigs of physical block */
+};
+
+/*
@@ -2755,22 +2579,22 @@ Index: linux-stage/include/linux/ext3_extents.h
+ * it's used at all the levels, but the bottom
+ */
+struct ext3_extent_idx {
-+ __u32 ei_block; /* index covers logical blocks from 'block' */
-+ __u32 ei_leaf; /* pointer to the physical block of the next *
++ __le32 ei_block; /* index covers logical blocks from 'block' */
++ __le32 ei_leaf; /* pointer to the physical block of the next *
+ * level. leaf or next index could bet here */
-+ __u16 ei_leaf_hi; /* high 16 bits of physical block */
++ __le16 ei_leaf_hi; /* high 16 bits of physical block */
+ __u16 ei_unused;
+};
+
+/*
+ * each block (leaves and indexes), even inode-stored has header
+ */
-+struct ext3_extent_header {
-+ __u16 eh_magic; /* probably will support different formats */
-+ __u16 eh_entries; /* number of valid entries */
-+ __u16 eh_max; /* capacity of store in entries */
-+ __u16 eh_depth; /* has tree real underlaying blocks? */
-+ __u32 eh_generation; /* flags(8 bits) | generation of the tree */
++struct ext3_extent_header {
++ __le16 eh_magic; /* probably will support different formats */
++ __le16 eh_entries; /* number of valid entries */
++ __le16 eh_max; /* capacity of store in entries */
++ __le16 eh_depth; /* has tree real underlaying blocks? */
++ __le32 eh_generation; /* flags(8 bits) | generation of the tree */
+};
+
+#define EXT3_EXT_MAGIC 0xf30a
@@ -2793,49 +2617,10 @@ Index: linux-stage/include/linux/ext3_extents.h
+ * structure for external API
+ */
+
-+/*
-+ * storage for cached extent
-+ */
-+struct ext3_ext_cache {
-+ __u32 ec_start;
-+ __u32 ec_block;
-+ __u32 ec_len;
-+ __u32 ec_type;
-+};
-+
+#define EXT3_EXT_CACHE_NO 0
+#define EXT3_EXT_CACHE_GAP 1
+#define EXT3_EXT_CACHE_EXTENT 2
-+
-+/*
-+ * ext3_extents_tree is used to pass initial information
-+ * to top-level extents API
-+ */
-+struct ext3_extents_helpers;
-+struct ext3_extents_tree {
-+ struct inode *inode; /* inode which tree belongs to */
-+ void *root; /* ptr to data top of tree resides at */
-+ void *buffer; /* will be passed as arg to ^^ routines */
-+ int buffer_len;
-+ void *private;
-+ struct ext3_ext_cache *cex;/* last found extent */
-+ struct ext3_extents_helpers *ops;
-+};
-+
-+struct ext3_extents_helpers {
-+ int (*get_write_access)(handle_t *h, void *buffer);
-+ int (*mark_buffer_dirty)(handle_t *h, void *buffer);
-+ int (*mergable)(struct ext3_extent *ex1, struct ext3_extent *ex2);
-+ int (*remove_extent_credits)(struct ext3_extents_tree *,
-+ struct ext3_extent *, unsigned long,
-+ unsigned long);
-+ int (*remove_extent)(struct ext3_extents_tree *,
-+ struct ext3_extent *, unsigned long,
-+ unsigned long);
-+ int (*new_block)(handle_t *, struct ext3_extents_tree *,
-+ struct ext3_ext_path *, struct ext3_extent *,
-+ int *);
-+};
++#define EXT3_EXT_HAS_NO_TREE /* ext3_extents_tree struct is not used*/
+
+/*
+ * to be called by ext3_ext_walk_space()
@@ -2843,9 +2628,9 @@ Index: linux-stage/include/linux/ext3_extents.h
+ * positive retcode - signal for ext3_ext_walk_space(), see below
+ * callback must return valid extent (passed or newly created)
+ */
-+typedef int (*ext_prepare_callback)(struct ext3_extents_tree *,
-+ struct ext3_ext_path *,
-+ struct ext3_ext_cache *);
++typedef int (*ext_prepare_callback)(struct inode *, struct ext3_ext_path *,
++ struct ext3_ext_cache *,
++ void *);
+
+#define EXT_CONTINUE 0
+#define EXT_BREAK 1
@@ -2854,6 +2639,9 @@ Index: linux-stage/include/linux/ext3_extents.h
+
+#define EXT_MAX_BLOCK 0xffffffff
+
++#define EXT_FLAGS_CLR_UNKNOWN 0x7 /* Flags cleared on modification */
++#define EXT_HDR_GEN_BITS 24
++#define EXT_HDR_GEN_MASK ((1 << EXT_HDR_GEN_BITS) - 1)
+
+#define EXT_FIRST_EXTENT(__hdr__) \
+ ((struct ext3_extent *) (((char *) (__hdr__)) + \
@@ -2862,89 +2650,249 @@ Index: linux-stage/include/linux/ext3_extents.h
+ ((struct ext3_extent_idx *) (((char *) (__hdr__)) + \
+ sizeof(struct ext3_extent_header)))
+#define EXT_HAS_FREE_INDEX(__path__) \
-+ ((__path__)->p_hdr->eh_entries < (__path__)->p_hdr->eh_max)
++ (le16_to_cpu((__path__)->p_hdr->eh_entries) \
++ < le16_to_cpu((__path__)->p_hdr->eh_max))
+#define EXT_LAST_EXTENT(__hdr__) \
-+ (EXT_FIRST_EXTENT((__hdr__)) + (__hdr__)->eh_entries - 1)
++ (EXT_FIRST_EXTENT((__hdr__)) + le16_to_cpu((__hdr__)->eh_entries) - 1)
+#define EXT_LAST_INDEX(__hdr__) \
-+ (EXT_FIRST_INDEX((__hdr__)) + (__hdr__)->eh_entries - 1)
++ (EXT_FIRST_INDEX((__hdr__)) + le16_to_cpu((__hdr__)->eh_entries) - 1)
+#define EXT_MAX_EXTENT(__hdr__) \
-+ (EXT_FIRST_EXTENT((__hdr__)) + (__hdr__)->eh_max - 1)
++ (EXT_FIRST_EXTENT((__hdr__)) + le16_to_cpu((__hdr__)->eh_max) - 1)
+#define EXT_MAX_INDEX(__hdr__) \
-+ (EXT_FIRST_INDEX((__hdr__)) + (__hdr__)->eh_max - 1)
-+#define EXT_HDR_GEN(__hdr__) ((__hdr__)->eh_generation & 0x00ffffff)
-+#define EXT_FLAGS(__hdr__) ((__hdr__)->eh_generation >> 24)
-+#define EXT_FLAGS_CLR_UNKNOWN 0x7 /* Flags cleared on modification */
-+
-+#define EXT_BLOCK_HDR(__bh__) ((struct ext3_extent_header *)(__bh__)->b_data)
-+#define EXT_ROOT_HDR(__tree__) ((struct ext3_extent_header *)(__tree__)->root)
-+#define EXT_DEPTH(__tree__) (EXT_ROOT_HDR(__tree__)->eh_depth)
-+#define EXT_GENERATION(__tree__) EXT_HDR_GEN(EXT_ROOT_HDR(__tree__))
-+
-+#define EXT_ASSERT(__x__) if (!(__x__)) BUG();
-+
-+#define EXT_CHECK_PATH(tree,path) \
-+{ \
-+ int depth = EXT_DEPTH(tree); \
-+ BUG_ON((unsigned long) (path) < __PAGE_OFFSET); \
-+ BUG_ON((unsigned long) (path)[depth].p_idx < \
-+ __PAGE_OFFSET && (path)[depth].p_idx != NULL); \
-+ BUG_ON((unsigned long) (path)[depth].p_ext < \
-+ __PAGE_OFFSET && (path)[depth].p_ext != NULL); \
-+ BUG_ON((unsigned long) (path)[depth].p_hdr < __PAGE_OFFSET); \
-+ BUG_ON((unsigned long) (path)[depth].p_bh < __PAGE_OFFSET \
-+ && depth != 0); \
-+ BUG_ON((path)[0].p_depth != depth); \
++ (EXT_FIRST_INDEX((__hdr__)) + le16_to_cpu((__hdr__)->eh_max) - 1)
++
++
++static inline struct ext3_extent_header *ext_inode_hdr(struct inode *inode)
++{
++ return (struct ext3_extent_header *) EXT3_I(inode)->i_data;
+}
+
++static inline struct ext3_extent_header *ext_block_hdr(struct buffer_head *bh)
++{
++ return (struct ext3_extent_header *) bh->b_data;
++}
+
-+/*
-+ * this structure is used to gather extents from the tree via ioctl
-+ */
-+struct ext3_extent_buf {
-+ unsigned long start;
-+ int buflen;
-+ void *buffer;
-+ void *cur;
-+ int err;
-+};
++static inline unsigned short ext_depth(struct inode *inode)
++{
++ return le16_to_cpu(ext_inode_hdr(inode)->eh_depth);
++}
+
-+/*
-+ * this structure is used to collect stats info about the tree
-+ */
-+struct ext3_extent_tree_stats {
-+ int depth;
-+ int extents_num;
-+ int leaf_num;
-+};
++static inline unsigned short ext_flags(struct ext3_extent_header *neh)
++{
++ return le16_to_cpu(neh->eh_generation) >> EXT_HDR_GEN_BITS;
++}
++
++static inline unsigned short ext_hdr_gen(struct ext3_extent_header *neh)
++{
++ return le16_to_cpu(neh->eh_generation) & EXT_HDR_GEN_MASK;
++}
++
++static inline unsigned short ext_generation(struct inode *inode)
++{
++ return ext_hdr_gen(ext_inode_hdr(inode));
++}
+
-+extern void ext3_init_tree_desc(struct ext3_extents_tree *, struct inode *);
-+extern int ext3_extent_tree_init(handle_t *, struct ext3_extents_tree *);
-+extern int ext3_ext_calc_credits_for_insert(struct ext3_extents_tree *, struct ext3_ext_path *);
-+extern int ext3_ext_insert_extent(handle_t *, struct ext3_extents_tree *, struct ext3_ext_path *, struct ext3_extent *);
-+extern int ext3_ext_walk_space(struct ext3_extents_tree *, unsigned long, unsigned long, ext_prepare_callback);
-+extern int ext3_ext_remove_space(struct ext3_extents_tree *, unsigned long, unsigned long);
-+extern struct ext3_ext_path * ext3_ext_find_extent(struct ext3_extents_tree *, int, struct ext3_ext_path *);
-+extern int ext3_ext_calc_blockmap_metadata(struct inode *, int);
++static inline void ext3_ext_tree_changed(struct inode *inode)
++{
++ struct ext3_extent_header *neh = ext_inode_hdr(inode);
++ neh->eh_generation = cpu_to_le32(
++ ((ext_flags(neh) & ~EXT_FLAGS_CLR_UNKNOWN) << EXT_HDR_GEN_BITS)
++ | ((ext_hdr_gen(neh) + 1) & EXT_HDR_GEN_MASK));
++}
+
+static inline void
-+ext3_ext_invalidate_cache(struct ext3_extents_tree *tree)
++ext3_ext_invalidate_cache(struct inode *inode)
+{
-+ if (tree->cex)
-+ tree->cex->ec_type = EXT3_EXT_CACHE_NO;
++ EXT3_I(inode)->i_cached_extent.ec_type = EXT3_EXT_CACHE_NO;
+}
+
++extern int ext3_ext_search_left(struct inode *, struct ext3_ext_path *, unsigned long *, unsigned long *);
++extern int ext3_ext_search_right(struct inode *, struct ext3_ext_path *, unsigned long *, unsigned long *);
++extern int ext3_extent_tree_init(handle_t *, struct inode *);
++extern int ext3_ext_calc_credits_for_insert(struct inode *, struct ext3_ext_path *);
++extern int ext3_ext_insert_extent(handle_t *, struct inode *, struct ext3_ext_path *, struct ext3_extent *);
++extern int ext3_ext_walk_space(struct inode *, unsigned long, unsigned long, ext_prepare_callback, void *);
++extern struct ext3_ext_path * ext3_ext_find_extent(struct inode *, int, struct ext3_ext_path *);
+
+#endif /* _LINUX_EXT3_EXTENTS */
-Index: linux-stage/include/linux/ext3_fs_i.h
++
+Index: linux-2.6.18.8/include/linux/ext3_fs.h
+===================================================================
+--- linux-2.6.18.8.orig/include/linux/ext3_fs.h 2007-07-17 09:18:13.000000000 +0200
++++ linux-2.6.18.8/include/linux/ext3_fs.h 2007-07-17 11:08:12.000000000 +0200
+@@ -182,8 +182,9 @@ struct ext3_group_desc
+ #define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */
+ #define EXT3_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/
+ #define EXT3_RESERVED_FL 0x80000000 /* reserved for ext3 lib */
++#define EXT3_EXTENTS_FL 0x00080000 /* Inode uses extents */
+
+-#define EXT3_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */
++#define EXT3_FL_USER_VISIBLE 0x000BDFFF /* User visible flags */
+ #define EXT3_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */
+
+ /*
+@@ -373,6 +374,8 @@ struct ext3_inode {
+ #define EXT3_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
+ #define EXT3_MOUNT_IOPEN 0x400000 /* Allow access via iopen */
+ #define EXT3_MOUNT_IOPEN_NOPRIV 0x800000/* Make iopen world-readable */
++#define EXT3_MOUNT_EXTENTS 0x2000000/* Extents support */
++#define EXT3_MOUNT_EXTDEBUG 0x4000000/* Extents debug */
+
+ /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
+ #ifndef clear_opt
+@@ -572,11 +575,13 @@ static inline int ext3_valid_inum(struct
+ #define EXT3_FEATURE_INCOMPAT_RECOVER 0x0004 /* Needs recovery */
+ #define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV 0x0008 /* Journal device */
+ #define EXT3_FEATURE_INCOMPAT_META_BG 0x0010
++#define EXT3_FEATURE_INCOMPAT_EXTENTS 0x0040 /* extents support */
+
+ #define EXT3_FEATURE_COMPAT_SUPP EXT2_FEATURE_COMPAT_EXT_ATTR
+ #define EXT3_FEATURE_INCOMPAT_SUPP (EXT3_FEATURE_INCOMPAT_FILETYPE| \
+ EXT3_FEATURE_INCOMPAT_RECOVER| \
+- EXT3_FEATURE_INCOMPAT_META_BG)
++ EXT3_FEATURE_INCOMPAT_META_BG| \
++ EXT3_FEATURE_INCOMPAT_EXTENTS)
+ #define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
+ EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
+ EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
+@@ -816,6 +821,9 @@ extern int ext3_get_inode_loc(struct ino
+ extern void ext3_truncate (struct inode *);
+ extern void ext3_set_inode_flags(struct inode *);
+ extern void ext3_set_aops(struct inode *inode);
++extern int ext3_writepage_trans_blocks(struct inode *);
++extern int ext3_block_truncate_page(handle_t *handle, struct page *page,
++ struct address_space *mapping, loff_t from);
+
+ /* ioctl.c */
+ extern int ext3_ioctl (struct inode *, struct file *, unsigned int,
+@@ -869,6 +877,30 @@ extern struct inode_operations ext3_spec
+ extern struct inode_operations ext3_symlink_inode_operations;
+ extern struct inode_operations ext3_fast_symlink_inode_operations;
+
++/* extents.c */
++extern int ext3_ext_tree_init(handle_t *handle, struct inode *);
++extern int ext3_ext_writepage_trans_blocks(struct inode *, int);
++extern int ext3_ext_get_blocks(handle_t *, struct inode *, sector_t,
++ unsigned long, struct buffer_head *, int, int);
++extern void ext3_ext_truncate(struct inode *, struct page *);
++extern void ext3_ext_init(struct super_block *);
++extern void ext3_ext_release(struct super_block *);
++static inline int
++ext3_get_blocks_wrap(handle_t *handle, struct inode *inode, sector_t block,
++ unsigned long max_blocks, struct buffer_head *bh,
++ int create, int extend_disksize)
++{
++ int ret;
++ if (EXT3_I(inode)->i_flags & EXT3_EXTENTS_FL)
++ return ext3_ext_get_blocks(handle, inode, block, max_blocks,
++ bh, create, extend_disksize);
++ ret = ext3_get_blocks_handle(handle, inode, block, max_blocks, bh, create,
++ extend_disksize);
++ if (ret > 0)
++ bh->b_size = (ret << inode->i_blkbits);
++ return ret;
++}
++
+
+ #endif /* __KERNEL__ */
+
+Index: linux-2.6.18.8/include/linux/ext3_fs_i.h
===================================================================
---- linux-stage.orig/include/linux/ext3_fs_i.h 2006-07-16 13:55:30.000000000 +0800
-+++ linux-stage/include/linux/ext3_fs_i.h 2006-07-16 14:10:20.000000000 +0800
-@@ -142,6 +142,8 @@ struct ext3_inode_info {
+--- linux-2.6.18.8.orig/include/linux/ext3_fs_i.h 2007-02-24 00:52:30.000000000 +0100
++++ linux-2.6.18.8/include/linux/ext3_fs_i.h 2007-07-17 11:08:11.000000000 +0200
+@@ -65,6 +65,16 @@ struct ext3_block_alloc_info {
+ #define rsv_end rsv_window._rsv_end
+
+ /*
++ * storage for cached extent
++ */
++struct ext3_ext_cache {
++ __u32 ec_start;
++ __u32 ec_block;
++ __u32 ec_len; /* must be 32bit to return holes */
++ __u32 ec_type;
++};
++
++/*
+ * third extended file system inode data in memory
+ */
+ struct ext3_inode_info {
+@@ -142,6 +152,8 @@ struct ext3_inode_info {
*/
struct mutex truncate_mutex;
struct inode vfs_inode;
+
-+ __u32 i_cached_extent[4];
++ struct ext3_ext_cache i_cached_extent;
};
#endif /* _LINUX_EXT3_FS_I */
+Index: linux-2.6.18.8/include/linux/ext3_fs_sb.h
+===================================================================
+--- linux-2.6.18.8.orig/include/linux/ext3_fs_sb.h 2007-02-24 00:52:30.000000000 +0100
++++ linux-2.6.18.8/include/linux/ext3_fs_sb.h 2007-07-17 11:08:12.000000000 +0200
+@@ -78,6 +78,16 @@ struct ext3_sb_info {
+ char *s_qf_names[MAXQUOTAS]; /* Names of quota files with journalled quota */
+ int s_jquota_fmt; /* Format of quota to use */
+ #endif
++
++#ifdef EXTENTS_STATS
++ /* ext3 extents stats */
++ unsigned long s_ext_min;
++ unsigned long s_ext_max;
++ unsigned long s_depth_max;
++ spinlock_t s_ext_stats_lock;
++ unsigned long s_ext_blocks;
++ unsigned long s_ext_extents;
++#endif
+ };
+
+ #endif /* _LINUX_EXT3_FS_SB */
+Index: linux-2.6.18.8/include/linux/ext3_jbd.h
+===================================================================
+--- linux-2.6.18.8.orig/include/linux/ext3_jbd.h 2007-02-24 00:52:30.000000000 +0100
++++ linux-2.6.18.8/include/linux/ext3_jbd.h 2007-07-17 09:18:14.000000000 +0200
+@@ -23,12 +23,20 @@
+
+ /* Define the number of blocks we need to account to a transaction to
+ * modify one block of data.
+- *
++ *
+ * We may have to touch one inode, one bitmap buffer, up to three
+ * indirection blocks, the group and superblock summaries, and the data
+- * block to complete the transaction. */
++ * block to complete the transaction.
++ *
++ * For extents-enabled fs we may have to allocate and modify upto
++ * 5 levels of tree + root which is stored in inode. */
++
++#define EXT3_SINGLEDATA_TRANS_BLOCKS(sb) \
++ (EXT3_HAS_INCOMPAT_FEATURE(sb, EXT3_FEATURE_INCOMPAT_EXTENTS) \
++ || test_opt(sb, EXTENTS) ? 27U : 8U)
+
+-#define EXT3_SINGLEDATA_TRANS_BLOCKS 8U
++/* Indicate that EXT3_SINGLEDATA_TRANS_BLOCKS takes the sb as argument */
++#define EXT3_SINGLEDATA_TRANS_BLOCKS_HAS_SB
+
+ /* Extended attribute operations touch at most two data buffers,
+ * two bitmap buffers, and two group summaries, in addition to the inode
+@@ -42,7 +50,7 @@
+ * superblock only gets updated once, of course, so don't bother
+ * counting that again for the quota updates. */
+
+-#define EXT3_DATA_TRANS_BLOCKS(sb) (EXT3_SINGLEDATA_TRANS_BLOCKS + \
++#define EXT3_DATA_TRANS_BLOCKS(sb) (EXT3_SINGLEDATA_TRANS_BLOCKS(sb) + \
+ EXT3_XATTR_TRANS_BLOCKS - 2 + \
+ 2*EXT3_QUOTA_TRANS_BLOCKS(sb))
+
+@@ -78,9 +86,9 @@
+ /* Amount of blocks needed for quota insert/delete - we do some block writes
+ * but inode, sb and group updates are done only once */
+ #define EXT3_QUOTA_INIT_BLOCKS(sb) (test_opt(sb, QUOTA) ? (DQUOT_INIT_ALLOC*\
+- (EXT3_SINGLEDATA_TRANS_BLOCKS-3)+3+DQUOT_INIT_REWRITE) : 0)
++ (EXT3_SINGLEDATA_TRANS_BLOCKS(sb)-3)+3+DQUOT_INIT_REWRITE) : 0)
+ #define EXT3_QUOTA_DEL_BLOCKS(sb) (test_opt(sb, QUOTA) ? (DQUOT_DEL_ALLOC*\
+- (EXT3_SINGLEDATA_TRANS_BLOCKS-3)+3+DQUOT_DEL_REWRITE) : 0)
++ (EXT3_SINGLEDATA_TRANS_BLOCKS(sb)-3)+3+DQUOT_DEL_REWRITE) : 0)
+ #else
+ #define EXT3_QUOTA_TRANS_BLOCKS(sb) 0
+ #define EXT3_QUOTA_INIT_BLOCKS(sb) 0