Branch b1_6

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / ext3-ea-in-inode-2.6-rhel4.patch

diff --git a/ldiskfs/kernel_patches/patches/ext3-ea-in-inode-2.6-rhel4.patch b/ldiskfs/kernel_patches/patches/ext3-ea-in-inode-2.6-rhel4.patch
index bf3ba6c..3aced41 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-ea-in-inode-2.6-rhel4.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-ea-in-inode-2.6-rhel4.patch
@@ -627,12 +627,12 @@ Index: linux-2.6.9-67.0.20/fs/ext3/xattr.c
 +      if (value) {
 +              int offs = min_offs - value_len;
 +              /* use last to create new entry */
 +      if (value) {
 +              int offs = min_offs - value_len;
 +              /* use last to create new entry */

++              memset(last, 0, esize);

 +              last->e_name_len = strlen(name);
 +              last->e_name_index = name_index;
 +              last->e_value_offs = cpu_to_le16(offs);
 +              last->e_value_size = cpu_to_le32(value_len);
 +              last->e_hash = last->e_value_block = 0;
 +              last->e_name_len = strlen(name);
 +              last->e_name_index = name_index;
 +              last->e_value_offs = cpu_to_le16(offs);
 +              last->e_value_size = cpu_to_le32(value_len);
 +              last->e_hash = last->e_value_block = 0;

-+              memset(last->e_name, 0, esize);

 +              memcpy(last->e_name, name, last->e_name_len);
 +              if (start + offs + value_len > end)
 +                      printk("ALERT at %s:%d: 0x%p + %d + %zd > 0x%p\n",
 +              memcpy(last->e_name, name, last->e_name_len);
 +              if (start + offs + value_len > end)
 +                      printk("ALERT at %s:%d: 0x%p + %d + %zd > 0x%p\n",