From 52073d3cf3bf2b3e155efde7ef8d88d44597caa7 Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 6 Feb 2004 07:21:20 +0000 Subject: [PATCH] - few additional asserts added --- lustre/kernel_patches/patches/ext3-extents-2.4.20.patch | 8 ++++++-- lustre/kernel_patches/patches/ext3-extents-2.4.21-suse2.patch | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/lustre/kernel_patches/patches/ext3-extents-2.4.20.patch b/lustre/kernel_patches/patches/ext3-extents-2.4.20.patch index 1edafe8..6422982 100644 --- a/lustre/kernel_patches/patches/ext3-extents-2.4.20.patch +++ b/lustre/kernel_patches/patches/ext3-extents-2.4.20.patch @@ -1,8 +1,8 @@ Index: linux-2.4.24/fs/ext3/extents.c =================================================================== --- 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-02-05 20:31:18.000000000 +0300 -@@ -0,0 +1,2343 @@ ++++ linux-2.4.24/fs/ext3/extents.c 2004-02-06 10:18:42.000000000 +0300 +@@ -0,0 +1,2347 @@ +/* + * Copyright (C) 2003 Alex Tomas + * @@ -427,6 +427,7 @@ Index: linux-2.4.24/fs/ext3/extents.c + EXT_ASSERT(tree->root); + + eh = EXT_ROOT_HDR(tree); ++ EXT_ASSERT(eh); + i = depth = EXT_DEPTH(tree); + EXT_ASSERT(eh->e_max); + EXT_ASSERT(eh->e_magic == EXT3_EXT_MAGIC); @@ -1044,6 +1045,7 @@ Index: linux-2.4.24/fs/ext3/extents.c + + depth = EXT_DEPTH(tree); + ex = path[depth].p_ext; ++ EXT_ASSERT(path[depth].p_hdr); + + /* try to insert block into found extent and return */ + if (ex && ext3_can_extents_be_merged(tree, ex, newext)) { @@ -1198,6 +1200,7 @@ Index: linux-2.4.24/fs/ext3/extents.c + } + + depth = EXT_DEPTH(tree); ++ EXT_ASSERT(path[depth].p_hdr); + ex = path[depth].p_ext; + next = ext3_ext_next_allocated_block(path); + @@ -1241,6 +1244,7 @@ Index: linux-2.4.24/fs/ext3/extents.c + } else + cbex = *ex; + ++ EXT_ASSERT(path[depth].p_hdr); + err = func(tree, path, &cbex, exists); + ext3_ext_drop_refs(path); + diff --git a/lustre/kernel_patches/patches/ext3-extents-2.4.21-suse2.patch b/lustre/kernel_patches/patches/ext3-extents-2.4.21-suse2.patch index 786ab5c..e09ea96 100644 --- a/lustre/kernel_patches/patches/ext3-extents-2.4.21-suse2.patch +++ b/lustre/kernel_patches/patches/ext3-extents-2.4.21-suse2.patch @@ -1,8 +1,8 @@ Index: linux-2.4.21-suse2/fs/ext3/extents.c =================================================================== --- linux-2.4.21-suse2.orig/fs/ext3/extents.c 2003-01-30 13:24:37.000000000 +0300 -+++ linux-2.4.21-suse2/fs/ext3/extents.c 2004-02-05 20:50:31.000000000 +0300 -@@ -0,0 +1,2344 @@ ++++ linux-2.4.21-suse2/fs/ext3/extents.c 2004-02-06 10:19:27.000000000 +0300 +@@ -0,0 +1,2348 @@ +/* + * Copyright (C) 2003 Alex Tomas + * @@ -427,6 +427,7 @@ Index: linux-2.4.21-suse2/fs/ext3/extents.c + EXT_ASSERT(tree->root); + + eh = EXT_ROOT_HDR(tree); ++ EXT_ASSERT(eh); + i = depth = EXT_DEPTH(tree); + EXT_ASSERT(eh->e_max); + EXT_ASSERT(eh->e_magic == EXT3_EXT_MAGIC); @@ -1044,6 +1045,7 @@ Index: linux-2.4.21-suse2/fs/ext3/extents.c + + depth = EXT_DEPTH(tree); + ex = path[depth].p_ext; ++ EXT_ASSERT(path[depth].p_hdr); + + /* try to insert block into found extent and return */ + if (ex && ext3_can_extents_be_merged(tree, ex, newext)) { @@ -1198,6 +1200,7 @@ Index: linux-2.4.21-suse2/fs/ext3/extents.c + } + + depth = EXT_DEPTH(tree); ++ EXT_ASSERT(path[depth].p_hdr); + ex = path[depth].p_ext; + next = ext3_ext_next_allocated_block(path); + @@ -1241,6 +1244,7 @@ Index: linux-2.4.21-suse2/fs/ext3/extents.c + } else + cbex = *ex; + ++ EXT_ASSERT(path[depth].p_hdr); + err = func(tree, path, &cbex, exists); + ext3_ext_drop_refs(path); + -- 1.8.3.1