Branch b1_8

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / ext3-uninit-2.6.9.patch

diff --git a/ldiskfs/kernel_patches/patches/ext3-uninit-2.6.9.patch b/ldiskfs/kernel_patches/patches/ext3-uninit-2.6.9.patch
index aa7effc..eb9a75d 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-uninit-2.6.9.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-uninit-2.6.9.patch
@@ -224,7 +224,7 @@ Index: linux-2.6.9-67.0.15/fs/ext3/group.h
 +/*
 + *  linux/fs/ext3/group.h
 + *
-+ * Copyright 2007 Sun Microsystems, Inc.
++ * Copyright 2008 Sun Microsystems, Inc.
 + *
 + * Author: Andreas Dilger <adilger@clusterfs.com>
 + */
@@ -535,9 +535,9 @@ Index: linux-2.6.9-67.0.15/fs/ext3/mballoc.c
                        &meta_group_info[j]->bb_state);
  
 @@ -2945,9 +2957,17 @@ int ext3_mb_mark_diskspace_used(struct e
+       mb_set_bits(NULL, bitmap_bh->b_data,
                    ac->ac_b_ex.fe_start, ac->ac_b_ex.fe_len);
  
-       spin_lock(sb_bgl_lock(sbi, ac->ac_b_ex.fe_group));
 +      if (gdp->bg_flags & cpu_to_le16(EXT3_BG_BLOCK_UNINIT)) {
 +              gdp->bg_flags &= cpu_to_le16(~EXT3_BG_BLOCK_UNINIT);
 +              gdp->bg_free_blocks_count =