LU-723 ldiskfs: remove ext3 RHEL5 kernel series

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / ext4-kill-dx_root.patch

diff --git a/ldiskfs/kernel_patches/patches/ext4-kill-dx_root.patch b/ldiskfs/kernel_patches/patches/ext4-kill-dx_root.patch
index 4591d3c..c8f2d1a 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext4-kill-dx_root.patch
+++ b/ldiskfs/kernel_patches/patches/ext4-kill-dx_root.patch
@@ -74,10 +74,10 @@ Index: b/fs/ext4/namei.c
 +      if (info->hash_version != DX_HASH_TEA &&
 +          info->hash_version != DX_HASH_HALF_MD4 &&
 +          info->hash_version != DX_HASH_LEGACY) {
-               ext4_warning(dir->i_sb, __func__,
-                            "Unrecognised inode hash code %d for directory "
--                           "#%lu", root->info.hash_version, dir->i_ino);
-+                           "#%lu", info->hash_version, dir->i_ino);
+               ext4_warning(dir->i_sb, "Unrecognised inode hash code %d"
+                            "for directory #%lu",
+-                           root->info.hash_version, dir->i_ino);
++                           info->hash_version, dir->i_ino);
                brelse(bh);
                *err = ERR_BAD_DX_DIR;
                goto fail;
@@ -87,14 +87,13 @@ Index: b/fs/ext4/namei.c
        if (hinfo->hash_version <= DX_HASH_TEA)
                hinfo->hash_version += EXT4_SB(dir->i_sb)->s_hash_unsigned;
        hinfo->seed = EXT4_SB(dir->i_sb)->s_hash_seed;
-@@ -398,29 +399,28 @@ dx_probe(struct dentry *dentry, struct i
+@@ -398,27 +399,26 @@ dx_probe(struct dentry *dentry, struct i
                ext4fs_dirhash(dentry->d_name.name, dentry->d_name.len, hinfo);
        hash = hinfo->hash;
  
 -      if (root->info.unused_flags & 1) {
 +      if (info->unused_flags & 1) {
-               ext4_warning(dir->i_sb, __func__,
-                            "Unimplemented inode hash flags: %#06x",
+               ext4_warning(dir->i_sb, "Unimplemented inode hash flags: %#06x",
 -                           root->info.unused_flags);
 +                           info->unused_flags);
                brelse(bh);
@@ -104,8 +103,7 @@ Index: b/fs/ext4/namei.c
  
 -      if ((indirect = root->info.indirect_levels) > 1) {
 +      if ((indirect = info->indirect_levels) > 1) {
-               ext4_warning(dir->i_sb, __func__,
-                            "Unimplemented inode hash depth: %#06x",
+               ext4_warning(dir->i_sb, "Unimplemented inode hash depth: %#06x",
 -                           root->info.indirect_levels);
 +                           info->indirect_levels);
                brelse(bh);
@@ -120,9 +118,9 @@ Index: b/fs/ext4/namei.c
        if (dx_get_limit(entries) != dx_root_limit(dir,
 -                                                 root->info.info_length)) {
 +                                                 info->info_length)) {
-               ext4_warning(dir->i_sb, __func__,
-                            "dx entry: limit != root limit");
+               ext4_warning(dir->i_sb, "dx entry: limit != root limit");
                brelse(bh);
+
 @@ -509,10 +510,12 @@ fail:
  
  static void dx_release (struct dx_frame *frames)
@@ -170,17 +168,17 @@ Index: b/fs/ext4/namei.c
        root = (struct dx_root *) bh->b_data;
  
 +      dot_de = (struct ext4_dir_entry_2 *) bh->b_data;
-+      dotdot_de = ext4_next_entry(dot_de);
++      dotdot_de = ext4_next_entry(dot_de, blocksize);
 +
        /* The 0th block becomes the root, move the dirents out */
 -      fde = &root->dotdot;
 -      de = (struct ext4_dir_entry_2 *)((char *)fde +
--              ext4_rec_len_from_disk(fde->rec_len));
+-              ext4_rec_len_from_disk(fde->rec_len, blocksize));
 +      de = (struct ext4_dir_entry_2 *)((char *)dotdot_de +
-+              ext4_rec_len_from_disk(dotdot_de->rec_len));
++              ext4_rec_len_from_disk(dotdot_de->rec_len, blocksize));
 -      if ((char *) de >= (((char *) root) + blocksize)) {
 +      if ((char *) de >= (((char *) dot_de) + blocksize)) {
-               ext4_error(dir->i_sb, __func__,
+               ext4_error(dir->i_sb,
                           "invalid rec_len for '..' in inode %lu",
                           dir->i_ino);
                brelse(bh);
@@ -191,12 +189,13 @@ Index: b/fs/ext4/namei.c
  
        /* Allocate new block for the 0th block's dirents */
        bh2 = ext4_append(handle, dir, &block, &retval);
-@@ -1472,18 +1475,23 @@ static int make_indexed_dir(handle_t *ha
-               de = de2;
+@@ -1472,19 +1475,23 @@ static int make_indexed_dir(handle_t *ha
        de->rec_len = ext4_rec_len_to_disk(data1 + blocksize - (char *) de);
+                                          blocksize);
        /* Initialize the root; the dot dirents already exist */
 -      de = (struct ext4_dir_entry_2 *) (&root->dotdot);
--      de->rec_len = ext4_rec_len_to_disk(blocksize - EXT4_DIR_REC_LEN(2));
+-      de->rec_len = ext4_rec_len_to_disk(blocksize - EXT4_DIR_REC_LEN(2),
+-                                         blocksize);
 -      memset (&root->info, 0, sizeof(root->info));
 -      root->info.info_length = sizeof(root->info);
 -      root->info.hash_version = EXT4_SB(dir->i_sb)->s_def_hash_version;
@@ -205,7 +204,7 @@ Index: b/fs/ext4/namei.c
 -      dx_set_count(entries, 1);
 -      dx_set_limit(entries, dx_root_limit(dir, sizeof(root->info)));
 +      dotdot_de->rec_len = ext4_rec_len_to_disk(blocksize -
-+                      le16_to_cpu(dot_de->rec_len));
++                      le16_to_cpu(dot_de->rec_len), blocksize);
 +
 +      /* initialize hashing info */
 +      dx_info = dx_get_dx_info(dot_de);