Keep b1_2 and b1_4 htree patches consistent.

b=3275

diff --git a/lustre/kernel_patches/patches/ext3-htree-2.4.19-pre1.patch b/lustre/kernel_patches/patches/ext3-htree-2.4.19-pre1.patch
index d74861d..c168149 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-htree-2.4.19-pre1.patch
+++ b/lustre/kernel_patches/patches/ext3-htree-2.4.19-pre1.patch
@@ -1668,7 +1668,7 @@ Index: linux-2.4.19-pre1/fs/ext3/namei.c
 +
 +      /* The 0th block becomes the root, move the dirents out */
 +      de = (struct ext3_dir_entry_2 *) &root->dotdot;
-+      de = (struct ext3_dir_entry_2 *) ((char *)de + de->rec_len);
++      de = (struct ext3_dir_entry_2 *)((char *)de + le16_to_cpu(de->rec_len));
 +      len = ((char *) root) + blocksize - (char *) de;
 +      memcpy (data1, de, len);
 +      de = (struct ext3_dir_entry_2 *) data1;

diff --git a/lustre/kernel_patches/patches/ext3-htree-2.4.21-chaos.patch b/lustre/kernel_patches/patches/ext3-htree-2.4.21-chaos.patch
index 8166bbe..b045d53 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-htree-2.4.21-chaos.patch
+++ b/lustre/kernel_patches/patches/ext3-htree-2.4.21-chaos.patch
@@ -1668,7 +1668,7 @@ Index: linux-2.4.21-chaos/fs/ext3/namei.c
 +
 +      /* The 0th block becomes the root, move the dirents out */
 +      de = (struct ext3_dir_entry_2 *) &root->dotdot;
-+      de = (struct ext3_dir_entry_2 *) ((char *)de + de->rec_len);
++      de = (struct ext3_dir_entry_2 *)((char *)de + le16_to_cpu(de->rec_len));
 +      len = ((char *) root) + blocksize - (char *) de;
 +      memcpy (data1, de, len);
 +      de = (struct ext3_dir_entry_2 *) data1;

diff --git a/lustre/kernel_patches/patches/ext3-htree-2.4.22-rh.patch b/lustre/kernel_patches/patches/ext3-htree-2.4.22-rh.patch
index 0ddbfd8..853fb0c 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-htree-2.4.22-rh.patch
+++ b/lustre/kernel_patches/patches/ext3-htree-2.4.22-rh.patch
@@ -1658,7 +1658,7 @@
 +
 +      /* The 0th block becomes the root, move the dirents out */
 +      de = (struct ext3_dir_entry_2 *) &root->dotdot;
-+      de = (struct ext3_dir_entry_2 *) ((char *)de + de->rec_len);
++      de = (struct ext3_dir_entry_2 *)((char *)de + le16_to_cpu(de->rec_len));
 +      len = ((char *) root) + blocksize - (char *) de;
 +      memcpy (data1, de, len);
 +      de = (struct ext3_dir_entry_2 *) data1;

diff --git a/lustre/kernel_patches/patches/ext3-htree-suse.patch b/lustre/kernel_patches/patches/ext3-htree-suse.patch
index c5ef970..1278f8f 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-htree-suse.patch
+++ b/lustre/kernel_patches/patches/ext3-htree-suse.patch
@@ -1668,7 +1668,7 @@ Index: linux-2.4.21-suse/fs/ext3/namei.c
 +
 +      /* The 0th block becomes the root, move the dirents out */
 +      de = (struct ext3_dir_entry_2 *) &root->dotdot;
-+      de = (struct ext3_dir_entry_2 *) ((char *)de + de->rec_len);
++      de = (struct ext3_dir_entry_2 *)((char *)de + le16_to_cpu(de->rec_len));
 +      len = ((char *) root) + blocksize - (char *) de;
 +      memcpy (data1, de, len);
 +      de = (struct ext3_dir_entry_2 *) data1;

diff --git a/lustre/kernel_patches/patches/ext3-htree.patch b/lustre/kernel_patches/patches/ext3-htree.patch
index dafd7a2..86b0061 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-htree.patch
+++ b/lustre/kernel_patches/patches/ext3-htree.patch
@@ -1658,7 +1658,7 @@
 +
 +      /* The 0th block becomes the root, move the dirents out */
 +      de = (struct ext3_dir_entry_2 *) &root->dotdot;
-+      de = (struct ext3_dir_entry_2 *) ((char *)de + de->rec_len);
++      de = (struct ext3_dir_entry_2 *)((char *)de + le16_to_cpu(de->rec_len));
 +      len = ((char *) root) + blocksize - (char *) de;
 +      memcpy (data1, de, len);
 +      de = (struct ext3_dir_entry_2 *) data1;

diff --git a/lustre/kernel_patches/patches/htree-ext3-2.4.18.patch b/lustre/kernel_patches/patches/htree-ext3-2.4.18.patch
index 37ca319..2d8236c 100644 (file)
--- a/lustre/kernel_patches/patches/htree-ext3-2.4.18.patch
+++ b/lustre/kernel_patches/patches/htree-ext3-2.4.18.patch
@@ -1007,7 +1007,7 @@
 +
 +              /* The 0th block becomes the root, move the dirents out */
 +              de = (struct ext3_dir_entry_2 *) &root->dotdot;
-+              de = (struct ext3_dir_entry_2 *) ((char *)de + le16_to_cpu(de->rec_len));
++              de = (struct ext3_dir_entry_2 *)((char *)de + le16_to_cpu(de->rec_len));
 +              len = ((char *) root) + sb->s_blocksize - (char *) de;
 +              memcpy (data1, de, len);
 +              de = (ext3_dirent *) data1;