b=7264

[fs/lustre-release.git] / lustre / kernel_patches / patches / ext3-mballoc2-2.6.10-fc3.patch

diff --git a/lustre/kernel_patches/patches/ext3-mballoc2-2.6.10-fc3.patch b/lustre/kernel_patches/patches/ext3-mballoc2-2.6.10-fc3.patch
index 0cdbd51..6d6dc0a 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-mballoc2-2.6.10-fc3.patch
+++ b/lustre/kernel_patches/patches/ext3-mballoc2-2.6.10-fc3.patch
@@ -942,7 +942,7 @@ Index: linux-2.6.10/fs/ext3/mballoc.c
 +                       * The only thing we can do is just take first
 +                       * found block(s)
 +                       */
-+                      printk(KERN_ERR "EXT3-fs: and someone won our chunk\n");
++                      /*printk(KERN_ERR "EXT3-fs: and someone won our chunk\n");*/
 +                      ac.ac_b_ex.fe_group = 0;
 +                      ac.ac_b_ex.fe_start = 0;
 +                      ac.ac_b_ex.fe_len = 0;
@@ -1856,7 +1856,7 @@ Index: linux-2.6.10/fs/ext3/mballoc.c
 +      int freed;
 +
 +      sb = inode->i_sb;
-+      if (!test_opt(sb, MBALLOC))
++      if (!test_opt(sb, MBALLOC) || EXT3_SB(sb)->s_buddy_blocks == NULL)
 +              ext3_free_blocks_sb(handle, sb, block, count, &freed);
 +      else
 +              ext3_mb_free_blocks(handle, inode, block, count, metadata, &freed);