-Index: linux-2.6.9-42.0.10.EL_lustre.1.4.10/fs/ext3/extents.c
+Index: linux-2.6.16.54-0.2.5/fs/ext3/extents.c
===================================================================
---- linux-2.6.9-42.0.10.EL_lustre.1.4.10.orig/fs/ext3/extents.c 2007-06-14 11:42:34.000000000 +0200
-+++ linux-2.6.9-42.0.10.EL_lustre.1.4.10/fs/ext3/extents.c 2007-06-14 13:59:49.000000000 +0200
-@@ -44,26 +44,49 @@
+--- linux-2.6.16.54-0.2.5.orig/fs/ext3/extents.c
++++ linux-2.6.16.54-0.2.5/fs/ext3/extents.c
+@@ -44,26 +44,60 @@
#include <asm/uaccess.h>
- 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;
-+static int __ext3_ext_check_header(const char *function, struct inode *inode,
++static int __ext3_ext_check_header(const char *function, int line, struct inode *inode,
+ struct ext3_extent_header *eh, int depth,
+ int max)
+{
+ if (unlikely(eh->eh_max == 0)) {
+ error_msg = "too small eh_max";
+ goto corrupted;
-+ }
+ }
+- if (eh->eh_max == 0) {
+- printk(KERN_ERR "EXT3-fs: invalid eh_max = %u\n",
+- (unsigned)eh->eh_max);
+- return -EIO;
++#ifdef AGRESSIVE_TEST
++ if (eh->eh_max > 3) {
++ /* inode probably got its extent without defining
++ * AGRESSIVE_TEST */
++ max = eh->eh_max;
+ }
+- if (eh->eh_entries > eh->eh_max) {
+- printk(KERN_ERR "EXT3-fs: invalid eh_entries = %u\n",
+- (unsigned)eh->eh_entries);
+- return -EIO;
++#endif
+ if (unlikely(eh->eh_max > max)) {
+ error_msg = "too large eh_max";
+ goto corrupted;
+ if (unlikely(eh->eh_entries > eh->eh_max)) {
+ error_msg = "invalid eh_entries";
+ goto corrupted;
++ }
++ if (unlikely((eh->eh_entries == 0) && (eh->eh_depth != 0))) {
++ error_msg = "invalid index, eh_entries=0 && eh_depth != 0";
++ 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)",
++ ":%d: bad header in inode #%lu: %s - magic %x, "
++ "entries %u, max %u(%u), depth %u(%u)", line,
+ inode->i_ino, error_msg, eh->eh_magic,
+ eh->eh_entries, eh->eh_max, max,
+ eh->eh_depth, depth);
}
+#define ext3_ext_check_header(inode,eh,depth,max) \
-+ __ext3_ext_check_header(__FUNCTION__,inode,eh,depth,max)
++ __ext3_ext_check_header(__FUNCTION__,__LINE__,inode,eh,depth,max)
+
+
static handle_t *ext3_ext_journal_restart(handle_t *handle, int needed)
{
int err;
-@@ -227,6 +250,26 @@ static inline int ext3_ext_space_root_id
+@@ -226,6 +260,26 @@ static inline int ext3_ext_space_root_id
return size;
}
static void ext3_ext_show_path(struct ext3_extents_tree *tree,
struct ext3_ext_path *path)
{
-@@ -297,10 +340,6 @@ ext3_ext_binsearch_idx(struct ext3_exten
+@@ -296,10 +350,6 @@ ext3_ext_binsearch_idx(struct ext3_exten
struct ext3_extent_idx *ix;
int l = 0, k, r;
ext_debug(tree, "binsearch for %d(idx): ", block);
path->p_idx = ix = EXT_FIRST_INDEX(eh);
-@@ -360,9 +399,6 @@ ext3_ext_binsearch(struct ext3_extents_t
+@@ -359,9 +409,6 @@ ext3_ext_binsearch(struct ext3_extents_t
struct ext3_extent *ex;
int l = 0, k, r;
if (eh->eh_entries == 0) {
/*
* this leaf is empty yet:
-@@ -437,6 +473,7 @@ ext3_ext_find_extent(struct ext3_extents
+@@ -436,6 +483,7 @@ ext3_ext_find_extent(struct ext3_extents
struct ext3_extent_header *eh;
struct buffer_head *bh;
int depth, i, ppos = 0;
EXT_ASSERT(tree);
EXT_ASSERT(tree->inode);
-@@ -444,17 +481,15 @@ ext3_ext_find_extent(struct ext3_extents
+@@ -443,17 +491,15 @@ ext3_ext_find_extent(struct ext3_extents
eh = EXT_ROOT_HDR(tree);
EXT_ASSERT(eh);
/* account possible depth increase */
if (!path) {
path = kmalloc(sizeof(struct ext3_ext_path) * (depth + 2),
-@@ -485,7 +520,8 @@ ext3_ext_find_extent(struct ext3_extents
+@@ -484,7 +530,8 @@ ext3_ext_find_extent(struct ext3_extents
path[ppos].p_hdr = eh;
i--;
goto err;
}
-@@ -494,9 +530,6 @@ ext3_ext_find_extent(struct ext3_extents
+@@ -493,9 +540,6 @@ ext3_ext_find_extent(struct ext3_extents
path[ppos].p_ext = NULL;
path[ppos].p_idx = NULL;
/* find extent */
ext3_ext_binsearch(tree, path + ppos, block);
-@@ -993,7 +1026,7 @@ ext3_ext_search_right(struct ext3_extent
+@@ -992,7 +1036,7 @@ ext3_ext_search_right(struct ext3_extent
struct ext3_extent_idx *ix;
struct ext3_extent *ex;
unsigned long block;
BUG_ON(path == NULL);
depth = path->p_depth;
-@@ -1051,7 +1084,8 @@ ext3_ext_search_right(struct ext3_extent
+@@ -1050,7 +1094,9 @@ ext3_ext_search_right(struct ext3_extent
if (bh == NULL)
return -EIO;
eh = EXT_BLOCK_HDR(bh);
- if (ext3_ext_check_header(eh)) {
+ max = ext3_ext_max_entries(tree, 0, depth);
-+ if (ext3_ext_check_header(tree->inode, eh, depth, max)) {
++ if (ext3_ext_check_header(tree->inode, eh,
++ path->p_depth - depth, max)) {
brelse(bh);
return -EIO;
}
-@@ -1064,7 +1098,8 @@ ext3_ext_search_right(struct ext3_extent
+@@ -1063,7 +1109,8 @@ ext3_ext_search_right(struct ext3_extent
if (bh == NULL)
return -EIO;
eh = EXT_BLOCK_HDR(bh);
- if (ext3_ext_check_header(eh)) {
+ max = ext3_ext_max_entries(tree, 0, depth);
-+ if (ext3_ext_check_header(tree->inode, eh, depth, max)) {
++ if (ext3_ext_check_header(tree->inode, eh, 0, max)) {
brelse(bh);
return -EIO;
}
-@@ -1694,6 +1729,8 @@ ext3_ext_rm_leaf(handle_t *handle, struc
+@@ -1693,6 +1740,8 @@ ext3_ext_rm_leaf(handle_t *handle, struc
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);
-@@ -1856,7 +1893,7 @@ int ext3_ext_remove_space(struct ext3_ex
+@@ -1855,7 +1904,7 @@ int ext3_ext_remove_space(struct ext3_ex
int depth = EXT_DEPTH(tree);
struct ext3_ext_path *path;
handle_t *handle;
ext_debug(tree, "space to be removed: %lu:%lu\n", start, end);
-@@ -1879,7 +1916,13 @@ int ext3_ext_remove_space(struct ext3_ex
+@@ -1878,7 +1927,13 @@ int ext3_ext_remove_space(struct ext3_ex
}
memset(path, 0, sizeof(struct ext3_ext_path) * (depth + 1));
path[i].p_hdr = EXT_ROOT_HDR(tree);
while (i >= 0 && err == 0) {
if (i == depth) {
/* this is leaf block */
-@@ -1889,16 +1932,13 @@ int ext3_ext_remove_space(struct ext3_ex
+@@ -1888,16 +1943,13 @@ int ext3_ext_remove_space(struct ext3_ex
i--;
continue;
}
if (!path[i].p_idx) {
/* this level hasn't touched yet */
path[i].p_idx =
-@@ -1925,6 +1965,14 @@ int ext3_ext_remove_space(struct ext3_ex
+@@ -1924,6 +1976,14 @@ int ext3_ext_remove_space(struct ext3_ex
err = -EIO;
break;
}
/* 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;
-@@ -1945,7 +1993,7 @@ int ext3_ext_remove_space(struct ext3_ex
+@@ -1944,7 +2004,7 @@ int ext3_ext_remove_space(struct ext3_ex
}
/* TODO: flexible tree reduction should be here */
/*
* truncate to zero freed all the tree
* so, we need to correct eh_depth
-@@ -1959,6 +2007,7 @@ int ext3_ext_remove_space(struct ext3_ex
+@@ -1958,6 +2018,7 @@ int ext3_ext_remove_space(struct ext3_ex
}
ext3_ext_tree_changed(tree);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff