+++ linux-2.6.18.8/fs/ext3/extents.c 2007-07-17 11:08:59.000000000 +0200
@@ -0,0 +1,2276 @@
+/*
-+ * Copyright 2008 Sun Microsystems, Inc.
++ * Copyright 2008, Sun Microsystems, Inc.
+ * Written by Alex Tomas <alex@clusterfs.com>
+ *
+ * Architecture independence:
+{
+ struct buffer_head *bh = NULL;
+ struct ext3_extent_header *eh;
-+ struct ext3_extent_idx *ix;
++ struct ext3_extent_idx *ix = NULL;
+ struct ext3_extent *ex;
+ unsigned long block;
+ int depth;
+}
+
+/*
-+ * returns first allocated block from next leaf or EXT_MAX_BLOCK
++ * returns first allocated block from next leaf or EXT_UNSET_BLOCK
+ */
+static unsigned ext3_ext_next_leaf_block(struct inode *inode,
+ struct ext3_ext_path *path)
+
+ /* zero-tree has no leaf blocks at all */
+ if (depth == 0)
-+ return EXT_MAX_BLOCK;
++ return EXT_UNSET_BLOCK;
+
+ /* go to index block */
+ depth--;
+ depth--;
+ }
+
-+ return EXT_MAX_BLOCK;
++ return EXT_UNSET_BLOCK;
+}
+
+/*
+ fex = EXT_LAST_EXTENT(eh);
+ 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) {
++ && next != EXT_UNSET_BLOCK) {
+ ext_debug(inode, "next leaf block - %d\n", next);
+ BUG_ON(npath != NULL);
+ npath = ext3_ext_find_extent(inode, next, NULL);
+ path[depth].p_ext = ex;
+
+ 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;
++ b = (unsigned long long)ex_ee_block + ex_ee_len - 1 <
++ EXT_MAX_BLOCK ? ex_ee_block + ex_ee_len - 1 : EXT_MAX_BLOCK;
+
+ ext_debug(inode, " border %u:%u\n", a, b);
+
depth = ext3_block_to_path(inode,iblock,offsets,&blocks_to_boundary);
@@ -984,12 +983,10 @@ static int ext3_get_block(struct inode *
+ started = 1;
+ }
- get_block:
- if (ret == 0) {
-- ret = ext3_get_blocks_handle(handle, inode, iblock,
-+ ret = ext3_get_blocks_wrap(handle, inode, iblock,
+- ret = ext3_get_blocks_handle(handle, inode, iblock,
++ 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;
-- }
- }
- return ret;
- }
+- if (ret > 0) {
+- bh_result->b_size = (ret << inode->i_blkbits);
++ if (ret > 0)
+ ret = 0;
+- }
+ if (started)
+ ext3_journal_stop(handle);
+ out:
@@ -1008,7 +1005,7 @@ struct buffer_head *ext3_getblk(handle_t
dummy.b_state = 0;
dummy.b_blocknr = -1000;
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.18.8/include/linux/ext3_extents.h 2007-07-17 09:18:14.000000000 +0200
-@@ -0,0 +1,231 @@
+@@ -0,0 +1,232 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.
+ * Written by Alex Tomas <alex@clusterfs.com>
+
+
+#define EXT_MAX_BLOCK 0xffffffff
++#define EXT_UNSET_BLOCK 1
+
+#define EXT_FLAGS_CLR_UNKNOWN 0x7 /* Flags cleared on modification */
+#define EXT_HDR_GEN_BITS 24