land v0.9.1 on HEAD, in preparation for a 1.0.x branch

[fs/lustre-release.git] / lustre / kernel_patches / patches / htree-ext3-2.4.18.patch

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 a54e9ca..2bfd0b9 100644 (file)
--- a/lustre/kernel_patches/patches/htree-ext3-2.4.18.patch
+++ b/lustre/kernel_patches/patches/htree-ext3-2.4.18.patch
@@ -673,7 +673,7 @@
  /*
   *    ext3_add_entry()
   *
-@@ -255,118 +849,278 @@
+@@ -255,118 +849,279 @@
        struct inode *inode)
  {
        struct inode *dir = dentry->d_parent->d_inode;
@@ -1006,7 +1006,8 @@
 +              data1 = bh2->b_data;
 +
 +              /* The 0th block becomes the root, move the dirents out */
-+              de = (ext3_dirent *) &root->info;
++              de = (struct ext3_dir_entry_2 *) &root->dotdot;
++              de = (struct ext3_dir_entry_2 *) ((char *)de + de->rec_len);
 +              len = ((char *) root) + sb->s_blocksize - (char *) de;
 +              memcpy (data1, de, len);
 +              de = (ext3_dirent *) data1;