2.6.24

 fs

 ext4

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 5fdb862..94ee6f3 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -144,7 +144,6 @@ struct dx_map_entry
    u16 size;
 };
 
-#ifdef CONFIG_EXT4_INDEX
 static inline unsigned dx_get_block (struct dx_entry *entry);
 static void dx_set_block (struct dx_entry *entry, unsigned value);
 static inline unsigned dx_get_hash (struct dx_entry *entry);
@@ -766,8 +765,6 @@ static void dx_insert_block(struct dx_frame *frame, u32 hash, u32 block)
    dx_set_block(new, block);
    dx_set_count(entries, count + 1);
 }
-#endif
-
 
 static void ext4_update_dx_flag(struct inode *inode)
 {
@@ -869,7 +866,6 @@ static struct buffer_head * ext4_find_entry (struct dentry *dentry,
    name = dentry->d_name.name;
    if (namelen > EXT4_NAME_LEN)
       return NULL;
-#ifdef CONFIG_EXT4_INDEX
    if (is_dx(dir)) {
       bh = ext4_dx_find_entry(dentry, res_dir, &err);
       /*
@@ -881,7 +877,6 @@ static struct buffer_head * ext4_find_entry (struct dentry *dentry,
          return bh;
       dxtrace(printk("ext4_find_entry: dx failed, falling back\n"));
    }
-#endif
    nblocks = dir->i_size >> EXT4_BLOCK_SIZE_BITS(sb);
    start = EXT4_I(dir)->i_dir_start_lookup;
    if (start >= nblocks)
@@ -957,7 +952,6 @@ cleanup_and_exit:
    return ret;
 }
 
-#ifdef CONFIG_EXT4_INDEX
 static struct buffer_head * ext4_dx_find_entry(struct dentry *dentry,
              struct ext4_dir_entry_2 **res_dir, int *err)
 {
@@ -1025,7 +1019,6 @@ errout:
    dx_release (frames);
    return NULL;
 }
-#endif
 
 static struct dentry *ext4_lookup(struct inode * dir, struct dentry *dentry, struct nameidata *nd)
 {
@@ -1121,7 +1114,6 @@ static inline void ext4_set_de_type(struct super_block *sb,
       de->file_type = ext4_type_by_mode[(mode & S_IFMT)>>S_SHIFT];
 }
 
-#ifdef CONFIG_EXT4_INDEX
 /*
  * Move count entries from end of map between two memory locations.
  * Returns pointer to last entry moved.
@@ -1266,8 +1258,6 @@ errout:
    *error = err;
    return NULL;
 }
-#endif
-
 
 /*
  * Add a new entry into a directory (leaf) block.  If de is non-NULL,
@@ -1364,7 +1354,6 @@ static int add_dirent_to_buf(handle_t *handle, struct dentry *dentry,
    return 0;
 }
 
-#ifdef CONFIG_EXT4_INDEX
 /*
  * This converts a one block unindexed directory to a 3 block indexed
  * directory, and adds the dentry to the indexed directory.
@@ -1443,7 +1432,6 @@ static int make_indexed_dir(handle_t *handle, struct dentry *dentry,
 
    return add_dirent_to_buf(handle, dentry, inode, de, bh);
 }
-#endif
 
 /*
  *   ext4_add_entry()
@@ -1464,9 +1452,7 @@ static int ext4_add_entry (handle_t *handle, struct dentry *dentry,
    struct ext4_dir_entry_2 *de;
    struct super_block * sb;
    int   retval;
-#ifdef CONFIG_EXT4_INDEX
    int   dx_fallback=0;
-#endif
    unsigned blocksize;
    u32 block, blocks;
 
@@ -1474,7 +1460,6 @@ static int ext4_add_entry (handle_t *handle, struct dentry *dentry,
    blocksize = sb->s_blocksize;
    if (!dentry->d_name.len)
       return -EINVAL;
-#ifdef CONFIG_EXT4_INDEX
    if (is_dx(dir)) {
       retval = ext4_dx_add_entry(handle, dentry, inode);
       if (!retval || (retval != ERR_BAD_DX_DIR))
@@ -1483,7 +1468,6 @@ static int ext4_add_entry (handle_t *handle, struct dentry *dentry,
       dx_fallback++;
       ext4_mark_inode_dirty(handle, dir);
    }
-#endif
    blocks = dir->i_size >> sb->s_blocksize_bits;
    for (block = 0, offset = 0; block < blocks; block++) {
       bh = ext4_bread(handle, dir, block, 0, &retval);
@@ -1493,11 +1477,9 @@ static int ext4_add_entry (handle_t *handle, struct dentry *dentry,
       if (retval != -ENOSPC)
          return retval;
 
-#ifdef CONFIG_EXT4_INDEX
       if (blocks == 1 && !dx_fallback &&
           EXT4_HAS_COMPAT_FEATURE(sb, EXT4_FEATURE_COMPAT_DIR_INDEX))
          return make_indexed_dir(handle, dentry, inode, bh);
-#endif
       brelse(bh);
    }
    bh = ext4_append(handle, dir, &block, &retval);
@@ -1509,7 +1491,6 @@ static int ext4_add_entry (handle_t *handle, struct dentry *dentry,
    return add_dirent_to_buf(handle, dentry, inode, de, bh);
 }
 
-#ifdef CONFIG_EXT4_INDEX
 /*
  * Returns 0 for success, or a negative error value
  */
@@ -1644,7 +1625,6 @@ cleanup:
    dx_release(frames);
    return err;
 }
-#endif
 
 /*
  * ext4_delete_entry deletes a directory entry by merging it with the