Branch HEAD

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

diff --git a/ldiskfs/kernel_patches/patches/ext3-uninit-2.6-sles10.patch b/ldiskfs/kernel_patches/patches/ext3-uninit-2.6-sles10.patch
index 709a0fd..0e6e14e 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-uninit-2.6-sles10.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-uninit-2.6-sles10.patch
@@ -65,10 +65,11 @@ Index: linux-2.6.16.54-0.2.5/fs/ext3/resize.c
  
  #define outside(b, first, last)       ((b) < (first) || (b) >= (last))
  #define inside(b, first, last)        ((b) >= (first) && (b) < (last))
-@@ -134,25 +135,6 @@ static struct buffer_head *bclean(handle
+@@ -133,25 +134,6 @@ static struct buffer_head *bclean(handle
+       return bh;
  }
  
- /*
+-/*
 - * To avoid calling the atomic setbit hundreds or thousands of times, we only
 - * need to use it within a single byte (to ensure we get endianness right).
 - * We can use memset for the rest of the bitmap as there are no other users.
@@ -87,10 +88,9 @@ Index: linux-2.6.16.54-0.2.5/fs/ext3/resize.c
 -              memset(bitmap + (i >> 3), 0xff, (end_bit - i) >> 3);
 -}
 -
--/*
-  * Set up the block and inode bitmaps, and the inode table for the new group.
-  * This doesn't need to be part of the main transaction, since we are only
-  * changing blocks outside the actual filesystem.  We still do journaling to
+ /*
+  * If we have fewer than thresh credits, extend by EXT3_MAX_TRANS_DATA.
+  * If that fails, restart the transaction & regain write access for the
 @@ -818,6 +800,7 @@ int ext3_group_add(struct super_block *s
        gdp->bg_inode_table = cpu_to_le32(input->inode_table);
        gdp->bg_free_blocks_count = cpu_to_le16(input->free_blocks_count);
@@ -224,7 +224,7 @@ Index: linux-2.6.16.54-0.2.5/fs/ext3/group.h
 +/*
 + *  linux/fs/ext3/group.h
 + *
-+ * Copyright (C) 2007 Cluster File Systems, Inc
++ * Copyright 2008 Sun Microsystems, Inc.
 + *
 + * Author: Andreas Dilger <adilger@clusterfs.com>
 + */