Merge upstream 2.6.13-rc1-git1 into 'ieee80211' branch of netdev-2.6.

[linux-2.6] / fs / reiserfs / stree.c

diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
index da23ba75f3d51006fe6b9486916e8dcd5e23497f..63158491e152c435b725543ce31c4c64ca18dee0 100644 (file)
--- a/fs/reiserfs/stree.c
+++ b/fs/reiserfs/stree.c
@@ -223,14 +223,13 @@ extern struct tree_balance * cur_tb;
 const struct reiserfs_key  MIN_KEY = {0, 0, {{0, 0},}};
 
 /* Maximal possible key. It is never in the tree. */
-const struct reiserfs_key  MAX_KEY = {
+static const struct reiserfs_key  MAX_KEY = {
        __constant_cpu_to_le32(0xffffffff),
        __constant_cpu_to_le32(0xffffffff),
        {{__constant_cpu_to_le32(0xffffffff),
        __constant_cpu_to_le32(0xffffffff)},}
 };
 
-const struct in_core_key  MAX_IN_CORE_KEY = {~0U, ~0U, ~0ULL>>4, 15};
 
 /* Get delimiting key of the buffer by looking for it in the buffers in the path, starting from the bottom
    of the path, and going upwards.  We must check the path's validity at each step.  If the key is not in