X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fkernel_patches%2Fpatches%2Fext3-extents-2.4.24.patch;h=067e6dfcf687f51ecd03f0682042c408cdce5b04;hp=ec759457f6d11b448d2ffc43a18e871f6e91778a;hb=bec39c83e2cbec874c4ee477184f8775501e7a88;hpb=191061ee668400324f4505cf498f1ee2d57e4962

diff --git a/lustre/kernel_patches/patches/ext3-extents-2.4.24.patch b/lustre/kernel_patches/patches/ext3-extents-2.4.24.patch
index ec75945..067e6df 100644
--- a/lustre/kernel_patches/patches/ext3-extents-2.4.24.patch
+++ b/lustre/kernel_patches/patches/ext3-extents-2.4.24.patch
@@ -1,10 +1,10 @@
-Index: linux-2.4.24-b1_4/fs/ext3/extents.c
+Index: linux-2.4.24/fs/ext3/extents.c
 ===================================================================
---- linux-2.4.24-b1_4.orig/fs/ext3/extents.c	2003-01-30 18:24:37.000000000 +0800
-+++ linux-2.4.24-b1_4/fs/ext3/extents.c	2004-09-30 14:04:33.000000000 +0800
-@@ -0,0 +1,2262 @@
+--- linux-2.4.24.orig/fs/ext3/extents.c	2003-01-30 13:24:37.000000000 +0300
++++ linux-2.4.24/fs/ext3/extents.c	2004-11-03 00:36:44.894076664 +0300
+@@ -0,0 +1,2314 @@
 +/*
-+ * Copyright (c) 2003, Cluster File Systems, Inc, info@clusterfs.com
++ * Copyright(c) 2003, 2004, 2005, 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
@@ -49,6 +49,27 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +#include <linux/ext3_extents.h>
 +#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;
@@ -86,8 +107,8 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 + *  - ENOMEM
 + */
 +static int ext3_ext_get_access(handle_t *handle,
-+				struct ext3_extents_tree *tree,
-+				struct ext3_ext_path *path)
++			       struct ext3_extents_tree *tree,
++			       struct ext3_ext_path *path)
 +{
 +	int err;
 +
@@ -108,7 +129,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 + *  - EIO
 + */
 +static int ext3_ext_dirty(handle_t *handle, struct ext3_extents_tree *tree,
-+				struct ext3_ext_path *path)
++			  struct ext3_ext_path *path)
 +{
 +	int err;
 +	if (path->p_bh) {
@@ -123,8 +144,8 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +
 +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)
++		   struct ext3_ext_path *path, struct ext3_extent *ex,
++		   int *err)
 +{
 +	int goal, depth, newblock;
 +	struct inode *inode;
@@ -143,22 +164,24 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +		unsigned long colour;
 +
 +		bg_start = (ei->i_block_group *
-+				EXT3_BLOCKS_PER_GROUP(inode->i_sb)) +
++			    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;
 +	}
 +
++	lock_kernel();
 +	newblock = ext3_new_block(handle, inode, goal, 0, 0, err);
++	unlock_kernel();
 +	return newblock;
 +}
 +
 +static inline void ext3_ext_tree_changed(struct ext3_extents_tree *tree)
 +{
-+	struct ext3_extent_header *neh;
-+	neh = EXT_ROOT_HDR(tree);
-+	neh->eh_generation++;
++	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);
 +}
 +
 +static inline int ext3_ext_space_block(struct ext3_extents_tree *tree)
@@ -166,8 +189,8 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +	int size;
 +
 +	size = (tree->inode->i_sb->s_blocksize -
-+			sizeof(struct ext3_extent_header))
-+				/ sizeof(struct ext3_extent);
++		sizeof(struct ext3_extent_header)) /
++				sizeof(struct ext3_extent);
 +#ifdef AGRESSIVE_TEST
 +	size = 6;
 +#endif
@@ -179,8 +202,8 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +	int size;
 +
 +	size = (tree->inode->i_sb->s_blocksize -
-+			sizeof(struct ext3_extent_header))
-+				/ sizeof(struct ext3_extent_idx);
++		sizeof(struct ext3_extent_header)) /
++				sizeof(struct ext3_extent_idx);
 +#ifdef AGRESSIVE_TEST
 +	size = 5;
 +#endif
@@ -191,8 +214,8 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +{
 +	int size;
 +
-+	size = (tree->buffer_len - sizeof(struct ext3_extent_header))
-+			/ sizeof(struct ext3_extent);
++	size = (tree->buffer_len - sizeof(struct ext3_extent_header)) /
++			sizeof(struct ext3_extent);
 +#ifdef AGRESSIVE_TEST
 +	size = 3;
 +#endif
@@ -203,9 +226,8 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +{
 +	int size;
 +
-+	size = (tree->buffer_len -
-+			sizeof(struct ext3_extent_header))
-+			/ sizeof(struct ext3_extent_idx);
++	size = (tree->buffer_len - sizeof(struct ext3_extent_header)) /
++			sizeof(struct ext3_extent_idx);
 +#ifdef AGRESSIVE_TEST
 +	size = 4;
 +#endif
@@ -213,7 +235,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +}
 +
 +static void ext3_ext_show_path(struct ext3_extents_tree *tree,
-+				struct ext3_ext_path *path)
++			       struct ext3_ext_path *path)
 +{
 +#ifdef EXT_DEBUG
 +	int k, l = path->p_depth;
@@ -222,12 +244,12 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +	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);
++				  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);
++				  path->p_ext->ee_block,
++				  path->p_ext->ee_len,
++				  path->p_ext->ee_start);
 +		} else
 +			ext_debug(tree, "  []");
 +	}
@@ -236,7 +258,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +}
 +
 +static void ext3_ext_show_leaf(struct ext3_extents_tree *tree,
-+				struct ext3_ext_path *path)
++			       struct ext3_ext_path *path)
 +{
 +#ifdef EXT_DEBUG
 +	int depth = EXT_DEPTH(tree);
@@ -252,7 +274,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +
 +	for (i = 0; i < eh->eh_entries; i++, ex++) {
 +		ext_debug(tree, "%d:%d:%d ",
-+				ex->ee_block, ex->ee_len, ex->ee_start);
++			  ex->ee_block, ex->ee_len, ex->ee_start);
 +	}
 +	ext_debug(tree, "\n");
 +#endif
@@ -263,11 +285,12 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +	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;
 +		}
++	}
 +}
 +
 +/*
@@ -275,7 +298,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 + */
 +static inline void
 +ext3_ext_binsearch_idx(struct ext3_extents_tree *tree,
-+			struct ext3_ext_path *path, int block)
++		       struct ext3_ext_path *path, int block)
 +{
 +	struct ext3_extent_header *eh = path->p_hdr;
 +	struct ext3_extent_idx *ix;
@@ -301,7 +324,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +
 +	ix += l;
 +	path->p_idx = ix;
-+	ext_debug(tree, "  -> %d->%d ", path->p_idx->ei_block, path->p_idx->ei_leaf);
++	ext_debug(tree," -> %d->%d ",path->p_idx->ei_block,path->p_idx->ei_leaf);
 +
 +	while (l++ < r) {
 +		if (block < ix->ei_block) 
@@ -309,7 +332,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +		path->p_idx = ix++;
 +	}
 +	ext_debug(tree, "  -> %d->%d\n", path->p_idx->ei_block,
-+			path->p_idx->ei_leaf);
++		  path->p_idx->ei_leaf);
 +
 +#ifdef CHECK_BINSEARCH 
 +	{
@@ -319,9 +342,9 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +		for (k = 0; k < eh->eh_entries; k++, ix++) {
 +			if (k != 0 && ix->ei_block <= 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);
++				       ix->ei_block,ix[-1].ei_block);
 +			}
 +			EXT_ASSERT(k == 0 || ix->ei_block > ix[-1].ei_block);
 +			if (block < ix->ei_block) 
@@ -331,7 +354,6 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +		EXT_ASSERT(chix == path->p_idx);
 +	}
 +#endif
-+
 +}
 +
 +/*
@@ -339,7 +361,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 + */
 +static inline void
 +ext3_ext_binsearch(struct ext3_extents_tree *tree,
-+			struct ext3_ext_path *path, int block)
++		   struct ext3_ext_path *path, int block)
 +{
 +	struct ext3_extent_header *eh = path->p_hdr;
 +	struct ext3_extent *ex;
@@ -373,7 +395,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +	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);
++		  path->p_ext->ee_start, path->p_ext->ee_len);
 +
 +	while (l++ < r) {
 +		if (block < ex->ee_block) 
@@ -381,7 +403,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +		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->ee_start, path->p_ext->ee_len);
 +
 +#ifdef CHECK_BINSEARCH 
 +	{
@@ -397,7 +419,6 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +		EXT_ASSERT(chex == path->p_ext);
 +	}
 +#endif
-+
 +}
 +
 +int ext3_extent_tree_init(handle_t *handle, struct ext3_extents_tree *tree)
@@ -418,7 +439,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +
 +struct ext3_ext_path *
 +ext3_ext_find_extent(struct ext3_extents_tree *tree, int block,
-+			struct ext3_ext_path *path)
++		     struct ext3_ext_path *path)
 +{
 +	struct ext3_extent_header *eh;
 +	struct buffer_head *bh;
@@ -430,15 +451,17 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +
 +	eh = EXT_ROOT_HDR(tree);
 +	EXT_ASSERT(eh);
++	if (ext3_ext_check_header(eh))
++		goto err;
++
 +	i = depth = EXT_DEPTH(tree);
 +	EXT_ASSERT(eh->eh_max);
 +	EXT_ASSERT(eh->eh_magic == EXT3_EXT_MAGIC);
-+	EXT_ASSERT(i == 0 || eh->eh_entries > 0);
 +	
 +	/* 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);
 +	}
@@ -448,29 +471,33 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +	/* walk through the tree */
 +	while (i) {
 +		ext_debug(tree, "depth %d: num %d, max %d\n",
-+				ppos, eh->eh_entries, eh->eh_max);
++			  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;
 +		path[ppos].p_depth = i;
 +		path[ppos].p_ext = NULL;
 +
 +		bh = sb_bread(tree->inode->i_sb, path[ppos].p_block);
-+		if (!bh) {
-+			ext3_ext_drop_refs(path);
-+			kfree(path);
-+			return ERR_PTR(-EIO);
-+		}
++		if (!bh)
++			goto err;
 +		eh = EXT_BLOCK_HDR(bh);
 +		ppos++;
 +		EXT_ASSERT(ppos <= depth);
 +		path[ppos].p_bh = bh;
 +		path[ppos].p_hdr = eh;
 +		i--;
++
++		if (ext3_ext_check_header(eh))
++			goto err;
 +	}
 +
 +	path[ppos].p_depth = i;
 +	path[ppos].p_hdr = eh;
 +	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);
@@ -478,6 +505,12 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +	ext3_ext_show_path(tree, path);
 +
 +	return path;
++
++err:
++	printk(KERN_ERR "EXT3-fs: header is corrupted!\n");
++	ext3_ext_drop_refs(path);
++	kfree(path);
++	return ERR_PTR(-EIO);
 +}
 +
 +/*
@@ -485,9 +518,9 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 + * 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)
++				 struct ext3_extents_tree *tree,
++				 struct ext3_ext_path *curp,
++				 int logical, int ptr)
 +{
 +	struct ext3_extent_idx *ix;
 +	int len, err;
@@ -503,9 +536,9 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +			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));
++				  "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;
@@ -514,15 +547,16 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +		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));
++			  "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_leaf_hi = ix->ei_unused = 0;
 +	curp->p_hdr->eh_entries++;
 +
 +	EXT_ASSERT(curp->p_hdr->eh_entries <= curp->p_hdr->eh_max);
@@ -544,8 +578,8 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 + *  - 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)
++			  struct ext3_ext_path *path,
++			  struct ext3_extent *newext, int at)
 +{
 +	struct buffer_head *bh = NULL;
 +	int depth = EXT_DEPTH(tree);
@@ -566,13 +600,13 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +	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);
++			  " next leaf starts at %d\n",
++			  (int)border);
 +	} else {
 +		border = newext->ee_block;
 +		ext_debug(tree, "leaf will be added."
-+				" next leaf starts at %d\n",
-+				(int)border);
++			  " next leaf starts at %d\n",
++			  (int)border);
 +	}
 +
 +	/* 
@@ -630,12 +664,11 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +	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));
++			  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++;
 +		m++;
 +	}
@@ -686,23 +719,24 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +		fidx = EXT_FIRST_INDEX(neh);
 +		fidx->ei_block = border;
 +		fidx->ei_leaf = 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);
++			  i, newblock, 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_MAX_INDEX(path[i].p_hdr));
 +		EXT_ASSERT(EXT_MAX_INDEX(path[i].p_hdr) ==
-+				EXT_LAST_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);
++				  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));
++				sizeof(struct ext3_extent_idx));
 +			neh->eh_entries++;
 +			EXT_ASSERT(neh->eh_entries <= neh->eh_max);
 +			m++;
@@ -732,7 +766,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +	/* insert new index */
 +	if (!err)
 +		err = ext3_ext_insert_index(handle, tree, path + at,
-+						border, newblock);
++					    border, newblock);
 +
 +cleanup:
 +	if (bh) {
@@ -762,9 +796,9 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 + *    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)
++				 struct ext3_extents_tree *tree,
++				 struct ext3_ext_path *path,
++				 struct ext3_extent *newext)
 +{
 +	struct ext3_ext_path *curp = path;
 +	struct ext3_extent_header *neh;
@@ -819,11 +853,12 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +	/* 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_hi = curp->p_idx->ei_unused = 0;
 +
 +	neh = EXT_ROOT_HDR(tree);
 +	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); 
++		  neh->eh_entries, neh->eh_max, fidx->ei_block, fidx->ei_leaf); 
 +
 +	neh->eh_depth = path->p_depth + 1;
 +	err = ext3_ext_dirty(handle, tree, curp);
@@ -838,9 +873,9 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 + * 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)
++				    struct ext3_extents_tree *tree,
++				    struct ext3_ext_path *path,
++				    struct ext3_extent *newext)
 +{
 +	struct ext3_ext_path *curp;
 +	int depth, i, err = 0;
@@ -916,12 +951,12 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +		if (depth == path->p_depth) {
 +			/* leaf */
 +			if (path[depth].p_ext !=
-+					EXT_LAST_EXTENT(path[depth].p_hdr))
++			    EXT_LAST_EXTENT(path[depth].p_hdr))
 +				return path[depth].p_ext[1].ee_block;
 +		} else {
 +			/* index */
 +			if (path[depth].p_idx !=
-+					EXT_LAST_INDEX(path[depth].p_hdr))
++			    EXT_LAST_INDEX(path[depth].p_hdr))
 +				return path[depth].p_idx[1].ei_block;
 +		}
 +		depth--;        
@@ -934,7 +969,7 @@ Index: linux-2.4.24-b1_4/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)
++					 struct ext3_ext_path *path)
 +{
 +	int depth;
 +
@@ -950,7 +985,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +	
 +	while (depth >= 0) {
 +		if (path[depth].p_idx !=
-+				EXT_LAST_INDEX(path[depth].p_hdr))
++		    EXT_LAST_INDEX(path[depth].p_hdr))
 +			return path[depth].p_idx[1].ei_block;
 +		depth--;        
 +	}
@@ -964,7 +999,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 + * 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)
++			     struct ext3_ext_path *path)
 +{
 +	struct ext3_extent_header *eh;
 +	int depth = EXT_DEPTH(tree);	
@@ -1014,8 +1049,8 @@ Index: linux-2.4.24-b1_4/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)
++			   struct ext3_extent *ex1,
++			   struct ext3_extent *ex2)
 +{
 +	if (ex1->ee_block + ex1->ee_len != ex2->ee_block)
 +		return 0;
@@ -1037,8 +1072,8 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 + * 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)
++			   struct ext3_ext_path *path,
++			   struct ext3_extent *newext)
 +{
 +	struct ext3_extent_header * eh;
 +	struct ext3_extent *ex, *fex;
@@ -1047,7 +1082,6 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +	int depth, len, err, next;
 +
 +	EXT_ASSERT(newext->ee_len > 0);
-+	EXT_ASSERT(newext->ee_len < EXT_CACHE_MARK);
 +	depth = EXT_DEPTH(tree);
 +	ex = path[depth].p_ext;
 +	EXT_ASSERT(path[depth].p_hdr);
@@ -1055,8 +1089,8 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +	/* 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);
++			  newext->ee_len, ex->ee_block, ex->ee_len,
++			  ex->ee_start);
 +		if ((err = ext3_ext_get_access(handle, tree, path + depth)))
 +			return err;
 +		ex->ee_len += newext->ee_len;
@@ -1084,12 +1118,12 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +		eh = npath[depth].p_hdr;
 +		if (eh->eh_entries < eh->eh_max) {
 +			ext_debug(tree,	"next leaf isnt full(%d)\n",
-+					eh->eh_entries);
++				  eh->eh_entries);
 +			path = npath;
 +			goto repeat;
 +		}
 +		ext_debug(tree, "next leaf hasno free space(%d,%d)\n",
-+				eh->eh_entries, eh->eh_max);
++			  eh->eh_entries, eh->eh_max);
 +	}
 +
 +	/*
@@ -1111,8 +1145,8 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +	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);
++			  newext->ee_block, newext->ee_start,
++			  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);
@@ -1121,10 +1155,10 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +			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);
++				  "move %d from 0x%p to 0x%p\n",
++				  newext->ee_block, newext->ee_start,
++				  newext->ee_len,
++				  nearex, len, nearex + 1, nearex + 2);
 +			memmove(nearex + 2, nearex + 1, len);
 +		}
 +		path[depth].p_ext = nearex + 1;
@@ -1133,9 +1167,9 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +		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);
++			  "move %d from 0x%p to 0x%p\n",
++			  newext->ee_block, newext->ee_start, newext->ee_len,
++			  nearex, len, nearex + 1, nearex + 2);
 +		memmove(nearex + 1, nearex, len);
 +		path[depth].p_ext = nearex;
 +	}
@@ -1156,8 +1190,8 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +		/* merge with next extent! */
 +		nearex->ee_len += 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--;
@@ -1187,7 +1221,8 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +			unsigned long num, ext_prepare_callback func)
 +{
 +	struct ext3_ext_path *path = NULL;
-+	struct ext3_extent *ex, cbex;
++	struct ext3_ext_cache cbex;
++	struct ext3_extent *ex;
 +	unsigned long next, start = 0, end = 0;
 +	unsigned long last = block + num;
 +	int depth, exists, err = 0;
@@ -1246,14 +1281,20 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +		EXT_ASSERT(end > start);
 +
 +		if (!exists) {
-+			cbex.ee_block = start;
-+			cbex.ee_len = end - start;
-+			cbex.ee_start = 0;
-+		} else
-+			cbex = *ex;
++			cbex.ec_block = start;
++			cbex.ec_len = end - start;
++			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_type = EXT3_EXT_CACHE_EXTENT;
++		}
 +
++		EXT_ASSERT(cbex.ec_len > 0);
 +		EXT_ASSERT(path[depth].p_hdr);
-+		err = func(tree, path, &cbex, exists);
++		err = func(tree, path, &cbex);
 +		ext3_ext_drop_refs(path);
 +
 +		if (err < 0)
@@ -1271,7 +1312,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +			path = NULL;
 +		}
 +
-+		block = cbex.ee_block + cbex.ee_len;
++		block = cbex.ec_block + cbex.ec_len;
 +	}
 +
 +	if (path) {
@@ -1283,14 +1324,15 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +}
 +
 +static inline void
-+ext3_ext_put_in_cache(struct ext3_extents_tree *tree, struct ext3_extent *ex)
++ext3_ext_put_in_cache(struct ext3_extents_tree *tree, __u32 block,
++		      __u32 len, __u32 start, int type)
 +{
++	EXT_ASSERT(len > 0);
 +	if (tree->cex) {
-+		EXT_ASSERT(ex);
-+		EXT_ASSERT(ex->ee_len);
-+		tree->cex->ee_block = ex->ee_block;
-+		tree->cex->ee_start = ex->ee_start;
-+		tree->cex->ee_len = ex->ee_len;
++		tree->cex->ec_type = type;
++		tree->cex->ec_block = block;
++		tree->cex->ec_len = len;
++		tree->cex->ec_start = start;
 +	}
 +}
 +
@@ -1300,11 +1342,12 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 + */
 +static inline void
 +ext3_ext_put_gap_in_cache(struct ext3_extents_tree *tree,
-+				struct ext3_ext_path *path,
-+				unsigned long block)
++			  struct ext3_ext_path *path,
++			  unsigned long block)
 +{
 +	int depth = EXT_DEPTH(tree);
-+	struct ext3_extent *ex, gex;
++	unsigned long lblock, len;
++	struct ext3_extent *ex;
 +
 +	if (!tree->cex)
 +		return;
@@ -1312,63 +1355,65 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +	ex = path[depth].p_ext;
 +	if (ex == NULL) {
 +		/* there is no extent yet, so gap is [0;-] */
-+		gex.ee_block = 0;
-+		gex.ee_len = EXT_CACHE_MARK;
++		lblock = 0;
++		len = EXT_MAX_BLOCK;
 +		ext_debug(tree, "cache gap(whole file):");
 +	} else if (block < ex->ee_block) {
-+		gex.ee_block = block;
-+		gex.ee_len = ex->ee_block - 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);
++			  (unsigned long) block,
++			  (unsigned long) ex->ee_block,
++			  (unsigned long) ex->ee_len);
 +	} else if (block >= ex->ee_block + ex->ee_len) {
-+		gex.ee_block = ex->ee_block + ex->ee_len;
-+		gex.ee_len = ext3_ext_next_allocated_block(path);
++		lblock = ex->ee_block + 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(gex.ee_len > gex.ee_block);
-+		gex.ee_len = gex.ee_len - gex.ee_block;
++			  (unsigned long) ex->ee_block,
++			  (unsigned long) ex->ee_len,
++			  (unsigned long) block);
++		EXT_ASSERT(len > lblock);
++		len = len - lblock;
 +	} else {
++		lblock = len = 0;
 +		BUG();
 +	}
 +
-+	ext_debug(tree, " -> %lu:%lu\n", (unsigned long) gex.ee_block,
-+			(unsigned long) gex.ee_len);
-+	gex.ee_start = EXT_CACHE_MARK;
-+	ext3_ext_put_in_cache(tree, &gex);
++	ext_debug(tree, " -> %lu:%lu\n", (unsigned long) lblock, len);
++	ext3_ext_put_in_cache(tree, 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)
++		  struct ext3_extent *ex)
 +{
-+	struct ext3_extent *cex = tree->cex;
++	struct ext3_ext_cache *cex = tree->cex;
 +
 +	/* is there cache storage at all? */
 +	if (!cex)
-+		return 0;
++		return EXT3_EXT_CACHE_NO;
 +
 +	/* has cache valid data? */
-+	if (cex->ee_len == 0)
-+		return 0;
-+
-+	if (block >= cex->ee_block && block < cex->ee_block + cex->ee_len) {
-+		ex->ee_block = cex->ee_block;
-+		ex->ee_start = cex->ee_start;
-+		ex->ee_len = cex->ee_len;
++	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);
++	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_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);
-+		return 1;
++			  (unsigned long) block,
++			  (unsigned long) ex->ee_block,
++			  (unsigned long) ex->ee_len,
++			  (unsigned long) ex->ee_start);
++		return cex->ec_type;
 +	}
 +
 +	/* not in cache */
-+	return 0;
++	return EXT3_EXT_CACHE_NO;
 +}
 +
 +/*
@@ -1377,7 +1422,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 + * last index in the block only
 + */
 +int ext3_ext_rm_idx(handle_t *handle, struct ext3_extents_tree *tree,
-+			struct ext3_ext_path *path)
++		    struct ext3_ext_path *path)
 +{
 +	struct buffer_head *bh;
 +	int err;
@@ -1391,7 +1436,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +	if ((err = ext3_ext_dirty(handle, tree, path)))
 +		return err;
 +	ext_debug(tree, "index is empty, remove it, free block %d\n",
-+			path->p_idx->ei_leaf);
++		  path->p_idx->ei_leaf);
 +	bh = sb_get_hash_table(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);
@@ -1399,7 +1444,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +}
 +
 +int ext3_ext_calc_credits_for_insert(struct ext3_extents_tree *tree,
-+					struct ext3_ext_path *path)
++				     struct ext3_ext_path *path)
 +{
 +	int depth = EXT_DEPTH(tree);
 +	int needed;
@@ -1436,8 +1481,8 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +
 +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)
++		      struct ext3_ext_path *path, unsigned long start,
++		      unsigned long end)
 +{
 +	struct ext3_extent *ex, tex;
 +	struct ext3_ext_path *npath;
@@ -1471,7 +1516,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +	/* 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);
++		  ex->ee_block, ex->ee_len, tex.ee_block, tex.ee_len);
 +
 +	npath = ext3_ext_find_extent(tree, ex->ee_block, NULL);
 +	if (IS_ERR(npath))
@@ -1485,13 +1530,12 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +	kfree(npath);
 +
 +	return err;
-+			
 +}
 +
 +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_ext_path *path, unsigned long start,
++		 unsigned long end)
 +{
 +	struct ext3_extent *ex, *fu = NULL, *lu, *le;
 +	int err = 0, correct_index = 0;
@@ -1524,8 +1568,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +	}
 +	
 +	lu = ex;
-+	while (ex >= EXT_FIRST_EXTENT(eh) &&
-+			ex->ee_block + ex->ee_len > start) {
++	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;
 +	
@@ -1552,7 +1595,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +			block = ex->ee_block; 
 +			num = 0;
 +			EXT_ASSERT(a == ex->ee_block &&
-+					b == ex->ee_block + ex->ee_len - 1);
++				   b == ex->ee_block + ex->ee_len - 1);
 +		}
 +
 +		if (ex == EXT_FIRST_EXTENT(eh))
@@ -1581,7 +1624,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +
 +		if (num == 0) {
 +			/* this extent is removed entirely mark slot unused */
-+			ex->ee_start = 0;
++			ex->ee_start = ex->ee_start_hi = 0;
 +			eh->eh_entries--;
 +			fu = ex;
 +		}
@@ -1594,7 +1637,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +			goto out;
 +
 +		ext_debug(tree, "new extent: %u:%u:%u\n",
-+				ex->ee_block, ex->ee_len, ex->ee_start);
++			  ex->ee_block, ex->ee_len, ex->ee_start);
 +		ex--;
 +	}
 +
@@ -1603,7 +1646,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +		while (lu < le) {
 +			if (lu->ee_start) {
 +				*fu = *lu;
-+				lu->ee_start = 0;
++				lu->ee_start = lu->ee_start_hi = 0;
 +				fu++;
 +			}
 +			lu++;
@@ -1658,7 +1701,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +}
 +
 +int ext3_ext_remove_space(struct ext3_extents_tree *tree,
-+				unsigned long start, unsigned long end)
++			  unsigned long start, unsigned long end)
 +{
 +	struct inode *inode = tree->inode;
 +	struct super_block *sb = inode->i_sb;
@@ -1682,8 +1725,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +	 */
 +	path = kmalloc(sizeof(struct ext3_ext_path) * (depth + 1), GFP_KERNEL);
 +	if (IS_ERR(path)) {
-+		ext3_error(sb, "ext3_ext_remove_space",
-+				"Can't allocate path array");
++		ext3_error(sb, __FUNCTION__, "Can't allocate path array");
 +		ext3_journal_stop(handle, inode);
 +		return -ENOMEM;
 +	}
@@ -1715,19 +1757,19 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +				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_hdr, 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);
++			  i, EXT_FIRST_INDEX(path[i].p_hdr),
++			  path[i].p_idx);
 +		if (ext3_ext_more_to_rm(path + i)) {
 +			/* go to the next level */
 +			ext_debug(tree, "move to level %d (block %d)\n",
-+					i + 1, path[i].p_idx->ei_leaf);
++				  i + 1, 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) {
@@ -1820,7 +1862,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +}
 +
 +static int ext3_ext_mergable(struct ext3_extent *ex1,
-+				struct ext3_extent *ex2)
++			     struct ext3_extent *ex2)
 +{
 +	/* FIXME: support for large fs */
 +	if (ex1->ee_start + ex1->ee_len == ex2->ee_start)
@@ -1830,8 +1872,8 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +
 +static int
 +ext3_remove_blocks_credits(struct ext3_extents_tree *tree,
-+				struct ext3_extent *ex,
-+				unsigned long from, unsigned long to)
++			   struct ext3_extent *ex,
++			   unsigned long from, unsigned long to)
 +{
 +	int needed;
 +	
@@ -1846,8 +1888,8 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +
 +static int
 +ext3_remove_blocks(struct ext3_extents_tree *tree,
-+				struct ext3_extent *ex,
-+				unsigned long from, unsigned long to)
++		   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);
@@ -1862,7 +1904,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +		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);
++			  num, start);
 +		for (i = 0; i < num; i++) {
 +			bh = sb_get_hash_table(tree->inode->i_sb, start + i);
 +			ext3_forget(handle, 0, tree->inode, bh, start + i);
@@ -1870,17 +1912,17 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +		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);
++		       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);
++		       from, to, ex->ee_block, ex->ee_len);
 +	}
 +	ext3_journal_stop(handle, tree->inode);
 +	return 0;
 +}
 +
 +int ext3_ext_find_goal(struct inode *inode, struct ext3_ext_path *path,
-+			unsigned long block)
++		       unsigned long block)
 +{
 +	struct ext3_inode_info *ei = EXT3_I(inode);
 +	unsigned long bg_start;
@@ -1910,8 +1952,8 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +}
 +
 +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 ext3_ext_path *path,
++			     struct ext3_extent *ex, int *err)
 +{
 +	struct inode *inode = tree->inode;
 +	int newblock, goal;
@@ -1928,7 +1970,10 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +		ex->ee_len = 1;
 +		/* allocate new block for the extent */
 +		goal = ext3_ext_find_goal(inode, path, ex->ee_block);
++		lock_kernel();
 +		ex->ee_start = ext3_new_block(handle, inode, goal, 0, 0, err);
++		ex->ee_start_hi = 0;
++		unlock_kernel();
 +		if (ex->ee_start == 0) {
 +			/* error occured: restore old extent */
 +			ex->ee_start = newblock;
@@ -1948,18 +1993,18 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +};
 +
 +void ext3_init_tree_desc(struct ext3_extents_tree *tree,
-+				struct inode *inode)
++			 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_extent *) &EXT3_I(inode)->i_cached_extent;
++	tree->cex = (struct ext3_ext_cache *) &EXT3_I(inode)->i_cached_extent;
 +	tree->ops = &ext3_blockmap_helpers;
 +}
 +
 +int ext3_ext_get_block(handle_t *handle, struct inode *inode,
-+			long iblock, struct buffer_head *bh_result, int create)
++		       long iblock, struct buffer_head *bh_result, int create)
 +{
 +	struct ext3_ext_path *path = NULL;
 +	struct ext3_extent newex;
@@ -1970,23 +2015,24 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +	clear_bit(BH_New, &bh_result->b_state);
 +	ext3_init_tree_desc(&tree, inode);
 +	ext_debug(&tree, "block %d requested for inode %u\n",
-+			(int) iblock, (unsigned) inode->i_ino);
++		  (int) iblock, (unsigned) inode->i_ino);
 +	down_write(&EXT3_I(inode)->truncate_sem);
 +
 +	/* check in cache */
-+	if (ext3_ext_in_cache(&tree, iblock, &newex)) {
-+		if (newex.ee_start == EXT_CACHE_MARK) {
-+			/* this is cached gap */
++	if ((goal = ext3_ext_in_cache(&tree, iblock, &newex))) {
++		if (goal == EXT3_EXT_CACHE_GAP) {
 +			if (!create) {
 +				/* block isn't allocated yet and
 +				 * user don't want to allocate it */
 +				goto out2;
 +			}
 +			/* we should allocate requested block */
-+		} else if (newex.ee_start) {
++		} else if (goal == EXT3_EXT_CACHE_EXTENT) {
 +			/* block is already allocated */
 +			newblock = iblock - newex.ee_block + newex.ee_start;
 +			goto out;
++		} else {
++			EXT_ASSERT(0);
 +		}
 +	}
 +
@@ -2012,9 +2058,11 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +		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);
++				  (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);
 +			goto out;
 +		}
 +	}
@@ -2031,15 +2079,18 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +
 +	/* allocate new block */
 +	goal = ext3_ext_find_goal(inode, path, iblock);
++	lock_kernel();
 +	newblock = ext3_new_block(handle, inode, goal, 0, 0, &err);
++	unlock_kernel();
 +	if (!newblock)
 +		goto out2;
 +	ext_debug(&tree, "allocate new block: goal %d, found %d\n",
-+			goal, newblock);
++		  goal, newblock);
 +
 +	/* try to insert new extent into found leaf and return */
 +	newex.ee_block = iblock;
 +	newex.ee_start = newblock;
++	newex.ee_start_hi = 0;
 +	newex.ee_len = 1;
 +	err = ext3_ext_insert_extent(handle, &tree, path, &newex);
 +	if (err)
@@ -2052,7 +2103,8 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +	newblock = newex.ee_start;
 +	set_bit(BH_New, &bh_result->b_state);
 +
-+	ext3_ext_put_in_cache(&tree, &newex);
++	ext3_ext_put_in_cache(&tree, newex.ee_block, newex.ee_len,
++			      newex.ee_start, EXT3_EXT_CACHE_EXTENT);
 +out:
 +	ext3_ext_show_leaf(&tree, path);
 +	set_bit(BH_Mapped, &bh_result->b_state);
@@ -2104,8 +2156,8 @@ Index: linux-2.4.24-b1_4/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);
++	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);
 +	
 +	/* In a multi-transaction truncate, we only make the final
@@ -2165,13 +2217,14 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +
 +static int
 +ext3_ext_store_extent_cb(struct ext3_extents_tree *tree,
-+			struct ext3_ext_path *path,
-+			struct ext3_extent *newex, int exist)
++			 struct ext3_ext_path *path,
++			 struct ext3_ext_cache *newex)
 +{
 +	struct ext3_extent_buf *buf = (struct ext3_extent_buf *) tree->private;
 +
-+	if (!exist)
++	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)
@@ -2189,14 +2242,14 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +
 +static int
 +ext3_ext_collect_stats_cb(struct ext3_extents_tree *tree,
-+			struct ext3_ext_path *path,
-+			struct ext3_extent *ex, int exist)
++			  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 (!exist)
++	if (ex->ec_type != EXT3_EXT_CACHE_EXTENT)
 +		return EXT_CONTINUE;
 +
 +	depth = EXT_DEPTH(tree);
@@ -2207,7 +2260,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +}
 +
 +int ext3_ext_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
-+		unsigned long arg)
++		   unsigned long arg)
 +{
 +	int err = 0;
 +
@@ -2227,7 +2280,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +		tree.private = &buf;
 +		down_write(&EXT3_I(inode)->truncate_sem);
 +		err = ext3_ext_walk_space(&tree, buf.start, EXT_MAX_BLOCK,
-+						ext3_ext_store_extent_cb);
++					  ext3_ext_store_extent_cb);
 +		up_write(&EXT3_I(inode)->truncate_sem);
 +		if (err == 0)
 +			err = buf.err;
@@ -2242,7 +2295,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +		buf.leaf_num = 0;
 +		tree.private = &buf;
 +		err = ext3_ext_walk_space(&tree, 0, EXT_MAX_BLOCK,
-+						ext3_ext_collect_stats_cb);
++					  ext3_ext_collect_stats_cb);
 +		up_write(&EXT3_I(inode)->truncate_sem);
 +		if (!err)
 +			err = copy_to_user((void *) arg, &buf, sizeof(buf));
@@ -2264,21 +2317,28 @@ Index: linux-2.4.24-b1_4/fs/ext3/extents.c
 +EXPORT_SYMBOL(ext3_ext_walk_space);
 +EXPORT_SYMBOL(ext3_ext_find_goal);
 +EXPORT_SYMBOL(ext3_ext_calc_credits_for_insert);
-+
-Index: linux-2.4.24-b1_4/fs/ext3/ialloc.c
+Index: linux-2.4.24/fs/ext3/ialloc.c
 ===================================================================
---- linux-2.4.24-b1_4.orig/fs/ext3/ialloc.c	2004-09-30 14:04:27.000000000 +0800
-+++ linux-2.4.24-b1_4/fs/ext3/ialloc.c	2004-09-30 14:04:33.000000000 +0800
-@@ -592,10 +592,21 @@
+--- linux-2.4.24.orig/fs/ext3/ialloc.c	2004-11-02 20:28:32.000000000 +0300
++++ linux-2.4.24/fs/ext3/ialloc.c	2004-11-02 20:32:17.000000000 +0300
+@@ -553,7 +553,8 @@ repeat:
+ 	inode->i_blksize = PAGE_SIZE;
+ 	inode->i_blocks = 0;
+ 	inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
+-	inode->u.ext3_i.i_flags = dir->u.ext3_i.i_flags & ~EXT3_INDEX_FL;
++	inode->u.ext3_i.i_flags = dir->u.ext3_i.i_flags &
++		~(EXT3_INDEX_FL | EXT3_EXTENTS_FL);
+ 	if (S_ISLNK(mode))
+ 		inode->u.ext3_i.i_flags &= ~(EXT3_IMMUTABLE_FL|EXT3_APPEND_FL);
+ #ifdef EXT3_FRAGMENTS
+@@ -592,6 +592,19 @@
  		iloc.bh = NULL;
  		goto fail;
  	}
--	err = ext3_mark_iloc_dirty(handle, inode, &iloc);
--	if (err) goto fail;
- 
-+ 	if (test_opt(sb, EXTENTS)) {
-+ 		EXT3_I(inode)->i_flags |= EXT3_EXTENTS_FL;
-+ 		ext3_extents_initialize_blockmap(handle, inode);
++	if (test_opt(sb, EXTENTS) && S_ISREG(inode->i_mode)) {
++		EXT3_I(inode)->i_flags |= EXT3_EXTENTS_FL;
++		memset(&EXT3_I(inode)->i_cached_extent, 0, sizeof(__u32) * 4);
++		ext3_extents_initialize_blockmap(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;
@@ -2287,23 +2347,21 @@ Index: linux-2.4.24-b1_4/fs/ext3/ialloc.c
 +			err = ext3_journal_dirty_metadata(handle, EXT3_SB(sb)->s_sbh);
 +		}
 +	}
++
+ 	err = ext3_mark_iloc_dirty(handle, inode, &iloc);
+ 	if (err) goto fail;
  
-+	err = ext3_mark_iloc_dirty(handle, inode, &iloc);
-+	if (err) goto fail;
- 	
- 	unlock_super (sb);
- 	if(DQUOT_ALLOC_INODE(inode)) {
-Index: linux-2.4.24-b1_4/fs/ext3/inode.c
+Index: linux-2.4.24/fs/ext3/inode.c
 ===================================================================
---- linux-2.4.24-b1_4.orig/fs/ext3/inode.c	2004-09-30 14:04:27.000000000 +0800
-+++ linux-2.4.24-b1_4/fs/ext3/inode.c	2004-09-30 14:04:33.000000000 +0800
+--- linux-2.4.24.orig/fs/ext3/inode.c	2004-11-02 20:28:33.000000000 +0300
++++ linux-2.4.24/fs/ext3/inode.c	2004-11-02 20:32:17.000000000 +0300
 @@ -848,6 +848,15 @@
  	goto reread;
  }
  
 +static inline int
 +ext3_get_block_wrap(handle_t *handle, struct inode *inode, long block,
-+		struct buffer_head *bh, int create)
++		    struct buffer_head *bh, int create)
 +{
 +	if (EXT3_I(inode)->i_flags & EXT3_EXTENTS_FL)
 +		return ext3_ext_get_block(handle, inode, block, bh, create);
@@ -2340,7 +2398,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/inode.c
  		struct address_space *mapping, loff_t from)
  {
  	unsigned long index = from >> PAGE_CACHE_SHIFT;
-@@ -1888,6 +1897,9 @@
+@@ -1889,6 +1898,9 @@
  
  	ext3_discard_prealloc(inode);
  
@@ -2350,7 +2408,15 @@ Index: linux-2.4.24-b1_4/fs/ext3/inode.c
  	handle = start_transaction(inode);
  	if (IS_ERR(handle))
  		return;		/* AKPM: return what? */
-@@ -2536,6 +2548,9 @@
+@@ -2225,6 +2237,7 @@
+ 	for (block = 0; block < EXT3_N_BLOCKS; block++)
+ 		inode->u.ext3_i.i_data[block] = iloc.raw_inode->i_block[block];
+ 	INIT_LIST_HEAD(&inode->u.ext3_i.i_orphan);
++	memset(&EXT3_I(inode)->i_cached_extent, 0, sizeof(__u32) * 4);
+ 
+ 	if (EXT3_INODE_SIZE(inode->i_sb) > EXT3_GOOD_OLD_INODE_SIZE)
+ 		inode->u.ext3_i.i_extra_isize =
+@@ -2537,6 +2550,9 @@
  	int indirects = (EXT3_NDIR_BLOCKS % bpp) ? 5 : 3;
  	int ret;
  	
@@ -2360,7 +2426,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/inode.c
  	if (ext3_should_journal_data(inode))
  		ret = 3 * (bpp + indirects) + 2;
  	else
-@@ -2972,7 +2987,7 @@
+@@ -2973,7 +2989,7 @@
  
  	/* alloc blocks one by one */
  	for (i = 0; i < nblocks; i++) {
@@ -2369,7 +2435,7 @@ Index: linux-2.4.24-b1_4/fs/ext3/inode.c
  						&bh_tmp, 1);
  		if (ret)
  			break;
-@@ -3048,7 +3063,7 @@
+@@ -3049,7 +3065,7 @@
                  if (blocks[i] != 0)
                          continue;
  
@@ -2378,10 +2444,10 @@ Index: linux-2.4.24-b1_4/fs/ext3/inode.c
                  if (rc) {
                          printk(KERN_INFO "ext3_map_inode_page: error %d "
                                 "allocating block %ld\n", rc, iblock);
-Index: linux-2.4.24-b1_4/fs/ext3/Makefile
+Index: linux-2.4.24/fs/ext3/Makefile
 ===================================================================
---- linux-2.4.24-b1_4.orig/fs/ext3/Makefile	2004-09-30 14:04:27.000000000 +0800
-+++ linux-2.4.24-b1_4/fs/ext3/Makefile	2004-09-30 14:04:33.000000000 +0800
+--- linux-2.4.24.orig/fs/ext3/Makefile	2004-11-02 20:28:32.000000000 +0300
++++ linux-2.4.24/fs/ext3/Makefile	2004-11-02 20:32:17.000000000 +0300
 @@ -13,7 +13,9 @@
  
  obj-y    := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o iopen.o \
@@ -2393,30 +2459,32 @@ Index: linux-2.4.24-b1_4/fs/ext3/Makefile
  obj-m    := $(O_TARGET)
  
  export-objs += xattr.o
-Index: linux-2.4.24-b1_4/fs/ext3/super.c
+Index: linux-2.4.24/fs/ext3/super.c
 ===================================================================
---- linux-2.4.24-b1_4.orig/fs/ext3/super.c	2004-09-30 14:04:27.000000000 +0800
-+++ linux-2.4.24-b1_4/fs/ext3/super.c	2004-09-30 14:04:33.000000000 +0800
-@@ -530,6 +530,7 @@
- 	int i;
- 
+--- linux-2.4.24.orig/fs/ext3/super.c	2004-11-02 20:28:32.000000000 +0300
++++ linux-2.4.24/fs/ext3/super.c	2004-11-02 20:32:17.000000000 +0300
+@@ -532,6 +532,7 @@
+ #ifdef EXT3_DELETE_THREAD
  	J_ASSERT(sbi->s_delete_inodes == 0);
+ #endif
 +	ext3_ext_release(sb);
  	ext3_xattr_put_super(sb);
  	journal_destroy(sbi->s_journal);
  	if (!(sb->s_flags & MS_RDONLY)) {
-@@ -702,6 +703,10 @@
+@@ -704,6 +705,12 @@
  				return 0;
  			}
  		}
 +		else if (!strcmp (this_char, "extents"))
 +			set_opt (*mount_options, EXTENTS);
++		else if (!strcmp (this_char, "noextents"))
++			clear_opt (*mount_options, EXTENTS);
 +		else if (!strcmp (this_char, "extdebug"))
 +			set_opt (*mount_options, EXTDEBUG);
  		else if (!strcmp (this_char, "grpid") ||
  			 !strcmp (this_char, "bsdgroups"))
  			set_opt (*mount_options, GRPID);
-@@ -1393,6 +1398,8 @@
+@@ -1395,6 +1400,8 @@
  		test_opt(sb,DATA_FLAGS) == EXT3_MOUNT_ORDERED_DATA ? "ordered":
  		"writeback");
  
@@ -2425,10 +2493,10 @@ Index: linux-2.4.24-b1_4/fs/ext3/super.c
  	return sb;
  
  failed_mount3:
-Index: linux-2.4.24-b1_4/fs/ext3/ioctl.c
+Index: linux-2.4.24/fs/ext3/ioctl.c
 ===================================================================
---- linux-2.4.24-b1_4.orig/fs/ext3/ioctl.c	2004-09-30 14:04:22.000000000 +0800
-+++ linux-2.4.24-b1_4/fs/ext3/ioctl.c	2004-09-30 14:04:33.000000000 +0800
+--- linux-2.4.24.orig/fs/ext3/ioctl.c	2004-11-02 20:28:29.000000000 +0300
++++ linux-2.4.24/fs/ext3/ioctl.c	2004-11-02 20:32:17.000000000 +0300
 @@ -174,6 +174,10 @@
  			return ret;
  		}
@@ -2440,34 +2508,37 @@ Index: linux-2.4.24-b1_4/fs/ext3/ioctl.c
  	default:
  		return -ENOTTY;
  	}
-Index: linux-2.4.24-b1_4/include/linux/ext3_fs.h
+Index: linux-2.4.24/include/linux/ext3_fs.h
 ===================================================================
---- linux-2.4.24-b1_4.orig/include/linux/ext3_fs.h	2004-09-30 14:04:27.000000000 +0800
-+++ linux-2.4.24-b1_4/include/linux/ext3_fs.h	2004-09-30 14:07:09.000000000 +0800
-@@ -184,6 +184,7 @@
+--- linux-2.4.24.orig/include/linux/ext3_fs.h	2004-11-02 20:28:32.000000000 +0300
++++ linux-2.4.24/include/linux/ext3_fs.h	2004-11-02 20:32:17.000000000 +0300
+@@ -184,8 +184,9 @@
  #define EXT3_IMAGIC_FL			0x00002000 /* AFS directory */
  #define EXT3_JOURNAL_DATA_FL		0x00004000 /* file data should be journaled */
  #define EXT3_RESERVED_FL		0x80000000 /* reserved for ext3 lib */
 +#define EXT3_EXTENTS_FL			0x00080000 /* Inode uses extents */
  
- #define EXT3_FL_USER_VISIBLE		0x00005FFF /* User visible flags */
+-#define EXT3_FL_USER_VISIBLE		0x00005FFF /* User visible flags */
++#define EXT3_FL_USER_VISIBLE		0x00085FFF /* User visible flags */
  #define EXT3_FL_USER_MODIFIABLE		0x000000FF /* User modifiable flags */
+ 
+ /*
 @@ -208,6 +209,9 @@
  #ifdef CONFIG_JBD_DEBUG
  #define EXT3_IOC_WAIT_FOR_READONLY	_IOR('f', 99, long)
  #endif
-+#define	EXT3_IOC_GET_EXTENTS		_IOR('f', 5, long)
-+#define	EXT3_IOC_GET_TREE_DEPTH		_IOR('f', 6, long)
-+#define	EXT3_IOC_GET_TREE_STATS		_IOR('f', 7, 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)
  
  /*
   * Structure of an inode on the disk
 @@ -327,6 +331,8 @@
  #define EXT3_MOUNT_ASYNCDEL		0x20000 /* Delayed deletion */
- #define EXT3_MOUNT_IOPEN		0x40000	/* Allow access via iopen */
- #define EXT3_MOUNT_IOPEN_NOPRIV		0x80000	/* Make iopen world-readable */
-+#define EXT3_MOUNT_EXTENTS		0x100000 /* Extents support */
-+#define EXT3_MOUNT_EXTDEBUG		0x200000 /* Extents debug */
+ #define EXT3_MOUNT_IOPEN		0x80000	/* Allow access via iopen */
+ #define EXT3_MOUNT_IOPEN_NOPRIV		0x100000/* Make iopen world-readable */
++#define EXT3_MOUNT_EXTENTS		0x200000/* Extents support */
++#define EXT3_MOUNT_EXTDEBUG		0x400000/* Extents debug */
  
  /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
  #ifndef _LINUX_EXT2_FS_H
@@ -2485,34 +2556,37 @@ Index: linux-2.4.24-b1_4/include/linux/ext3_fs.h
  #define EXT3_FEATURE_RO_COMPAT_SUPP	(EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
  					 EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
  					 EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
-@@ -688,6 +696,7 @@
+@@ -688,6 +696,8 @@
  extern unsigned long ext3_count_free (struct buffer_head *, unsigned);
  
  /* inode.c */
 +extern int ext3_block_truncate_page(handle_t *, struct address_space *, loff_t);
++extern int ext3_writepage_trans_blocks(struct inode *inode);
  extern int ext3_forget(handle_t *, int, struct inode *, struct buffer_head *, int);
  extern struct buffer_head * ext3_getblk (handle_t *, struct inode *, long, int, int *);
  extern struct buffer_head * ext3_bread (handle_t *, struct inode *, int, int, int *);
-@@ -769,6 +778,14 @@
+@@ -769,6 +778,16 @@
  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);
++			      struct buffer_head *, int);
 +extern void ext3_ext_truncate(struct inode *);
 +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-2.4.24-b1_4/include/linux/ext3_extents.h
+Index: linux-2.4.24/include/linux/ext3_extents.h
 ===================================================================
---- linux-2.4.24-b1_4.orig/include/linux/ext3_extents.h	2003-01-30 18:24:37.000000000 +0800
-+++ linux-2.4.24-b1_4/include/linux/ext3_extents.h	2004-09-30 14:04:33.000000000 +0800
-@@ -0,0 +1,237 @@
+--- linux-2.4.24.orig/include/linux/ext3_extents.h	2003-01-30 13:24:37.000000000 +0300
++++ linux-2.4.24/include/linux/ext3_extents.h	2004-11-02 20:32:17.000000000 +0300
+@@ -0,0 +1,261 @@
 +/*
 + * Copyright (c) 2003, Cluster File Systems, Inc, info@clusterfs.com
 + * Written by Alex Tomas <alex@clusterfs.com>
@@ -2552,9 +2626,9 @@ Index: linux-2.4.24-b1_4/include/linux/ext3_extents.h
 + * if EXT_DEBUG is defined you can use 'extdebug' mount option
 + * to get lots of info what's going on
 + */
-+#define EXT_DEBUG
++#define EXT_DEBUG_
 +#ifdef EXT_DEBUG
-+#define ext_debug(tree,fmt,a...) 			\
++#define ext_debug(tree,fmt,a...)			\
 +do {							\
 +	if (test_opt((tree)->inode->i_sb, EXTDEBUG))	\
 +		printk(fmt, ##a);			\
@@ -2610,7 +2684,7 @@ Index: linux-2.4.24-b1_4/include/linux/ext3_extents.h
 +	__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;	/* generation of the tree */
++	__u32	eh_generation;	/* flags(8 bits) | generation of the tree */
 +};
 +
 +#define EXT3_EXT_MAGIC		0xf30a
@@ -2634,6 +2708,20 @@ Index: linux-2.4.24-b1_4/include/linux/ext3_extents.h
 + */
 +
 +/*
++ * 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
 + */
@@ -2644,7 +2732,7 @@ Index: linux-2.4.24-b1_4/include/linux/ext3_extents.h
 +	void *buffer;		/* will be passed as arg to ^^ routines	*/
 +	int buffer_len;
 +	void *private;
-+	struct ext3_extent *cex;/* last found extent */
++	struct ext3_ext_cache *cex;/* last found extent */
 +	struct ext3_extents_helpers *ops;
 +};
 +
@@ -2653,14 +2741,14 @@ Index: linux-2.4.24-b1_4/include/linux/ext3_extents.h
 +	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);
++				     struct ext3_extent *, unsigned long,
++				     unsigned long);
 +	int (*remove_extent)(struct ext3_extents_tree *,
-+				struct ext3_extent *, unsigned long,
-+				unsigned long);
++			     struct ext3_extent *, unsigned long,
++			     unsigned long);
 +	int (*new_block)(handle_t *, struct ext3_extents_tree *,
-+				struct ext3_ext_path *, struct ext3_extent *,
-+				int *);
++			 struct ext3_ext_path *, struct ext3_extent *,
++			 int *);
 +};
 +
 +/*
@@ -2670,8 +2758,8 @@ Index: linux-2.4.24-b1_4/include/linux/ext3_extents.h
 + * callback must return valid extent (passed or newly created)
 + */
 +typedef int (*ext_prepare_callback)(struct ext3_extents_tree *,
-+					struct ext3_ext_path *,
-+					struct ext3_extent *, int);
++				    struct ext3_ext_path *,
++				    struct ext3_ext_cache *);
 +
 +#define EXT_CONTINUE	0
 +#define EXT_BREAK	1
@@ -2679,7 +2767,6 @@ Index: linux-2.4.24-b1_4/include/linux/ext3_extents.h
 +
 +
 +#define EXT_MAX_BLOCK	0xffffffff
-+#define EXT_CACHE_MARK	0xffff
 +
 +
 +#define EXT_FIRST_EXTENT(__hdr__) \
@@ -2698,19 +2785,31 @@ Index: linux-2.4.24-b1_4/include/linux/ext3_extents.h
 +	(EXT_FIRST_EXTENT((__hdr__)) + (__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_ROOT_HDR(tree) \
-+	((struct ext3_extent_header *) (tree)->root)
-+#define EXT_BLOCK_HDR(bh) \
-+	((struct ext3_extent_header *) (bh)->b_data)
-+#define EXT_DEPTH(_t_)	\
-+	(((struct ext3_extent_header *)((_t_)->root))->eh_depth)
-+#define EXT_GENERATION(_t_)	\
-+	(((struct ext3_extent_header *)((_t_)->root))->eh_generation)
-+
++#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);				\
++}
++
 +
 +/*
 + * this structure is used to gather extents from the tree via ioctl
@@ -2732,7 +2831,7 @@ Index: linux-2.4.24-b1_4/include/linux/ext3_extents.h
 +	int leaf_num;
 +};
 +
-+void ext3_init_tree_desc(struct ext3_extents_tree *, struct 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 *);
@@ -2744,22 +2843,21 @@ Index: linux-2.4.24-b1_4/include/linux/ext3_extents.h
 +ext3_ext_invalidate_cache(struct ext3_extents_tree *tree)
 +{
 +	if (tree->cex)
-+		tree->cex->ee_len = 0;
++		tree->cex->ec_type = EXT3_EXT_CACHE_NO;
 +}
 +
 +
 +#endif /* _LINUX_EXT3_EXTENTS */
-+
-Index: linux-2.4.24-b1_4/include/linux/ext3_fs_i.h
+Index: linux-2.4.24/include/linux/ext3_fs_i.h
 ===================================================================
---- linux-2.4.24-b1_4.orig/include/linux/ext3_fs_i.h	2004-09-30 14:04:27.000000000 +0800
-+++ linux-2.4.24-b1_4/include/linux/ext3_fs_i.h	2004-09-30 14:04:33.000000000 +0800
+--- linux-2.4.24.orig/include/linux/ext3_fs_i.h	2004-11-02 20:28:32.000000000 +0300
++++ linux-2.4.24/include/linux/ext3_fs_i.h	2004-11-02 20:43:45.000000000 +0300
 @@ -76,6 +76,8 @@
  	 * by other means, so we have truncate_sem.
  	 */
  	struct rw_semaphore truncate_sem;
 +
-+	__u32 i_cached_extent[3];
++	__u32 i_cached_extent[4];
  };
  
  #endif	/* _LINUX_EXT3_FS_I */