A checksum of each group descriptor is used to ensure that corruption in
the group descriptor's bit flags does not cause incorrect operation.
-Index: linux-rhel5/include/linux/ext3_fs.h
+Index: linux-2.6.22.14/include/linux/ext3_fs.h
===================================================================
---- linux-rhel5.orig/include/linux/ext3_fs.h 2007-07-18 17:32:04.000000000 +0200
-+++ linux-rhel5/include/linux/ext3_fs.h 2007-07-18 17:32:15.000000000 +0200
-@@ -150,16 +150,22 @@ struct ext3_allocation_request {
+--- linux-2.6.22.14.orig/include/linux/ext3_fs.h
++++ linux-2.6.22.14/include/linux/ext3_fs.h
+@@ -146,16 +146,22 @@ struct ext3_allocation_request {
*/
struct ext3_group_desc
{
/*
* Macro-instructions used to manage group descriptors
*/
-@@ -603,6 +609,7 @@ static inline int ext3_valid_inum(struct
+@@ -617,6 +623,7 @@ static inline int ext3_valid_inum(struct
#define EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER 0x0001
#define EXT3_FEATURE_RO_COMPAT_LARGE_FILE 0x0002
#define EXT3_FEATURE_RO_COMPAT_BTREE_DIR 0x0004
#define EXT4_FEATURE_RO_COMPAT_DIR_NLINK 0x0020
#define EXT3_FEATURE_INCOMPAT_COMPRESSION 0x0001
-@@ -619,6 +626,7 @@ static inline int ext3_valid_inum(struct
+@@ -633,6 +640,7 @@ static inline int ext3_valid_inum(struct
EXT3_FEATURE_INCOMPAT_EXTENTS)
#define EXT3_FEATURE_RO_COMPAT_SUPP (EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
-Index: linux-rhel5/fs/ext3/resize.c
+Index: linux-2.6.22.14/fs/ext3/resize.c
===================================================================
---- linux-rhel5.orig/fs/ext3/resize.c 2007-07-15 09:36:00.000000000 +0200
-+++ linux-rhel5/fs/ext3/resize.c 2007-07-18 17:32:15.000000000 +0200
-@@ -18,6 +18,7 @@
+--- linux-2.6.22.14.orig/fs/ext3/resize.c
++++ linux-2.6.22.14/fs/ext3/resize.c
+@@ -16,6 +16,7 @@
#include <linux/errno.h>
#include <linux/slab.h>
#define outside(b, first, last) ((b) < (first) || (b) >= (last))
#define inside(b, first, last) ((b) >= (first) && (b) < (last))
-@@ -834,6 +835,7 @@ int ext3_group_add(struct super_block *s
+@@ -135,25 +136,6 @@ static struct buffer_head *bclean(handle
+ }
+
+ /*
+- * 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.
+- */
+-static void mark_bitmap_end(int start_bit, int end_bit, char *bitmap)
+-{
+- int i;
+-
+- if (start_bit >= end_bit)
+- return;
+-
+- ext3_debug("mark end bits +%d through +%d used\n", start_bit, end_bit);
+- for (i = start_bit; i < ((start_bit + 7) & ~7UL); i++)
+- ext3_set_bit(i, bitmap);
+- if (i < end_bit)
+- 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
+@@ -833,6 +815,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);
gdp->bg_free_inodes_count = cpu_to_le16(EXT3_INODES_PER_GROUP(sb));
/*
* Make the new blocks and inodes valid next. We do this before
-Index: linux-rhel5/fs/ext3/super.c
+Index: linux-2.6.22.14/fs/ext3/super.c
===================================================================
---- linux-rhel5.orig/fs/ext3/super.c 2007-07-18 17:32:06.000000000 +0200
-+++ linux-rhel5/fs/ext3/super.c 2007-07-18 17:35:03.000000000 +0200
+--- linux-2.6.22.14.orig/fs/ext3/super.c
++++ linux-2.6.22.14/fs/ext3/super.c
@@ -41,6 +41,7 @@
#include "xattr.h"
#include "acl.h"
static int ext3_load_journal(struct super_block *, struct ext3_super_block *,
unsigned long journal_devnum);
-@@ -1225,6 +1226,91 @@ static int ext3_setup_super(struct super
+@@ -1224,6 +1225,91 @@ static int ext3_setup_super(struct super
return res;
}
/* Called at mount-time, super-block is locked */
static int ext3_check_descriptors (struct super_block * sb)
{
-@@ -1279,6 +1365,13 @@ static int ext3_check_descriptors (struc
+@@ -1278,6 +1364,13 @@ static int ext3_check_descriptors (struc
le32_to_cpu(gdp->bg_inode_table));
return 0;
}
first_block += EXT3_BLOCKS_PER_GROUP(sb);
gdp++;
}
-Index: linux-rhel5/fs/ext3/group.h
+Index: linux-2.6.22.14/fs/ext3/group.h
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-rhel5/fs/ext3/group.h 2007-07-18 17:32:15.000000000 +0200
-@@ -0,0 +1,29 @@
+--- /dev/null
++++ linux-2.6.22.14/fs/ext3/group.h
+@@ -0,0 +1,30 @@
+/*
+ * linux/fs/ext3/group.h
+ *
+extern unsigned ext3_init_inode_bitmap(struct super_block *sb,
+ struct buffer_head *bh, int group,
+ struct ext3_group_desc *desc);
++extern void mark_bitmap_end(int start_bit, int end_bit, char *bitmap);
+#endif /* _LINUX_EXT3_GROUP_H */
-Index: linux-rhel5/fs/ext3/ialloc.c
+Index: linux-2.6.22.14/fs/ext3/ialloc.c
===================================================================
---- linux-rhel5.orig/fs/ext3/ialloc.c 2007-07-18 17:32:05.000000000 +0200
-+++ linux-rhel5/fs/ext3/ialloc.c 2007-07-18 17:32:15.000000000 +0200
+--- linux-2.6.22.14.orig/fs/ext3/ialloc.c
++++ linux-2.6.22.14/fs/ext3/ialloc.c
@@ -28,6 +28,7 @@
#include "xattr.h"
+ * 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.
+ */
-+static void mark_bitmap_end(int start_bit, int end_bit, char *bitmap)
++void mark_bitmap_end(int start_bit, int end_bit, char *bitmap)
+{
+ int i;
+
/* This is the optimal IO size (for stat), not the fs block size */
inode->i_blocks = 0;
inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
-Index: linux-rhel5/fs/ext3/mballoc.c
+Index: linux-2.6.22.14/fs/ext3/mballoc.c
===================================================================
---- linux-rhel5.orig/fs/ext3/mballoc.c 2007-07-18 17:32:04.000000000 +0200
-+++ linux-rhel5/fs/ext3/mballoc.c 2007-07-18 17:32:15.000000000 +0200
+--- linux-2.6.22.14.orig/fs/ext3/mballoc.c
++++ linux-2.6.22.14/fs/ext3/mballoc.c
@@ -36,6 +36,8 @@
#include <linux/seq_file.h>
#include <linux/version.h>
get_bh(bh[i]);
bh[i]->b_end_io = end_buffer_read_sync;
submit_bh(READ, bh[i]);
-@@ -1732,6 +1737,10 @@ static int ext3_mb_good_group(struct ext
+@@ -1733,6 +1738,10 @@ static int ext3_mb_good_group(struct ext
switch (cr) {
case 0:
BUG_ON(ac->ac_2order == 0);
bits = ac->ac_sb->s_blocksize_bits + 1;
for (i = ac->ac_2order; i <= bits; i++)
if (grp->bb_counters[i] > 0)
-@@ -1825,7 +1834,9 @@ repeat:
+@@ -1826,7 +1835,9 @@ repeat:
}
ac->ac_groups_scanned++;
ext3_mb_simple_scan_group(ac, &e3b);
else if (cr == 1 && ac->ac_g_ex.fe_len == sbi->s_stripe)
ext3_mb_scan_aligned(ac, &e3b);
-@@ -2304,12 +2315,13 @@ int ext3_mb_init_backend(struct super_bl
+@@ -2306,12 +2317,13 @@ int ext3_mb_init_backend(struct super_bl
i--;
goto err_freebuddy;
}
set_bit(EXT3_GROUP_INFO_NEED_INIT_BIT,
&meta_group_info[j]->bb_state);
-@@ -2958,9 +2970,17 @@ int ext3_mb_mark_diskspace_used(struct e
- mb_set_bits(bitmap_bh->b_data, ac->ac_b_ex.fe_start, ac->ac_b_ex.fe_len);
+@@ -2945,9 +2957,17 @@ int ext3_mb_mark_diskspace_used(struct e
+ 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)) {
spin_unlock(sb_bgl_lock(sbi, ac->ac_b_ex.fe_group));
percpu_counter_mod(&sbi->s_freeblocks_counter, - ac->ac_b_ex.fe_len);
-@@ -4346,6 +4366,7 @@ do_more:
+@@ -4357,6 +4377,7 @@ do_more:
spin_lock(sb_bgl_lock(sbi, block_group));
gdp->bg_free_blocks_count =
cpu_to_le16(le16_to_cpu(gdp->bg_free_blocks_count) + count);
spin_unlock(sb_bgl_lock(sbi, block_group));
percpu_counter_mod(&sbi->s_freeblocks_counter, count);
-Index: linux-rhel5/fs/ext3/balloc.c
+Index: linux-2.6.22.14/fs/ext3/balloc.c
===================================================================
---- linux-rhel5.orig/fs/ext3/balloc.c 2007-07-18 17:32:04.000000000 +0200
-+++ linux-rhel5/fs/ext3/balloc.c 2007-07-18 17:32:15.000000000 +0200
-@@ -20,6 +20,7 @@
+--- linux-2.6.22.14.orig/fs/ext3/balloc.c
++++ linux-2.6.22.14/fs/ext3/balloc.c
+@@ -20,10 +20,88 @@
#include <linux/quotaops.h>
#include <linux/buffer_head.h>
/*
* balloc.c contains the blocks allocation and deallocation routines
*/
-@@ -73,6 +74,75 @@ struct ext3_group_desc * ext3_get_group_
- return desc + offset;
- }
+/* Initializes an uninitialized block bitmap if given, and returns the
+ * number of blocks free in the group. */
+ for (bit = le32_to_cpu(gdp->bg_inode_table) - start,
+ bit_max = bit + sbi->s_itb_per_group; bit < bit_max; bit++)
+ ext3_set_bit(bit, bh->b_data);
++
++ /*
++ * Also if the number of blocks within the group is
++ * less than the blocksize * 8 ( which is the size
++ * of bitmap ), set rest of the block bitmap to 1
++ */
++ mark_bitmap_end(EXT3_BLOCKS_PER_GROUP(sb), sb->s_blocksize * 8,
++ bh->b_data);
+ }
+
+ return free_blocks - sbi->s_itb_per_group - 2;
+}
+
/*
- * Read the bitmap for a given block_group, reading into the specified
- * slot in the superblock's bitmap cache.
-@@ -88,7 +158,19 @@ read_block_bitmap(struct super_block *sb
+ * The free blocks are managed by bitmaps. A file system contains several
+ * blocks groups. Each group contains 1 bitmap block for blocks, 1 bitmap
+@@ -99,7 +177,19 @@ read_block_bitmap(struct super_block *sb
desc = ext3_get_group_desc (sb, block_group, NULL);
if (!desc)
goto error_out;
if (!bh)
ext3_error (sb, "read_block_bitmap",
"Cannot read block bitmap - "
-@@ -467,6 +549,7 @@ do_more:
+@@ -571,6 +661,7 @@ do_more:
desc->bg_free_blocks_count =
cpu_to_le16(le16_to_cpu(desc->bg_free_blocks_count) +
group_freed);
spin_unlock(sb_bgl_lock(sbi, block_group));
percpu_counter_mod(&sbi->s_freeblocks_counter, count);
-@@ -1434,8 +1517,11 @@ allocated:
+@@ -1637,8 +1728,11 @@ allocated:
ret_block, goal_hits, goal_attempts);
spin_lock(sb_bgl_lock(sbi, group_no));