# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # # fs/ext2/ialloc.c | 173 ++++++++++++++++++++++++- # fs/ext2/super.c | 18 ++ # fs/ext3/ialloc.c | 311 +++++++++++++++++++++++++++++++++------------ # fs/ext3/super.c | 11 + # include/linux/ext2_fs.h | 7 - # include/linux/ext2_fs_sb.h | 2 # include/linux/ext3_fs.h | 7 - # include/linux/ext3_fs_sb.h | 2 # 8 files changed, 440 insertions(+), 91 deletions(-) # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 02/11/07 tytso@snap.thunk.org 1.783 # Orlov block allocator for ext2/3 # # This is Al's implementation of the Orlov block allocator for ext2/3. # # At least doubles the throughput for the traverse-a-kernel-tree # test and is well tested. # -------------------------------------------- # --- linux-2.4-ext3merge/fs/ext2/ialloc.c.=K0012=.orig 2003-03-13 16:22:45.000000000 +0000 +++ linux-2.4-ext3merge/fs/ext2/ialloc.c 2003-03-13 16:22:52.000000000 +0000 @@ -17,6 +17,7 @@ #include #include #include +#include /* @@ -228,8 +229,7 @@ error_return: * For other inodes, search forward from the parent directory\'s block * group to find a free inode. */ - -static int find_group_dir(struct super_block *sb, int parent_group) +static int find_group_dir(struct super_block *sb, const struct inode *parent) { struct ext2_super_block * es = sb->u.ext2_sb.s_es; int ngroups = sb->u.ext2_sb.s_groups_count; @@ -262,8 +262,140 @@ static int find_group_dir(struct super_b return best_group; } -static int find_group_other(struct super_block *sb, int parent_group) +/* + * Orlov's allocator for directories. + * + * We always try to spread first-level directories. + * + * If there are blockgroups with both free inodes and free blocks counts + * not worse than average we return one with smallest directory count. + * Otherwise we simply return a random group. + * + * For the rest rules look so: + * + * It's OK to put directory into a group unless + * it has too many directories already (max_dirs) or + * it has too few free inodes left (min_inodes) or + * it has too few free blocks left (min_blocks) or + * it's already running too large debt (max_debt). + * Parent's group is prefered, if it doesn't satisfy these + * conditions we search cyclically through the rest. If none + * of the groups look good we just look for a group with more + * free inodes than average (starting at parent's group). + * + * Debt is incremented each time we allocate a directory and decremented + * when we allocate an inode, within 0--255. + */ + +#define INODE_COST 64 +#define BLOCK_COST 256 + +static int find_group_orlov(struct super_block *sb, const struct inode *parent) +{ + int parent_group = parent->u.ext2_i.i_block_group; + struct ext2_sb_info *sbi = EXT2_SB(sb); + struct ext2_super_block *es = sbi->s_es; + int ngroups = sbi->s_groups_count; + int inodes_per_group = EXT2_INODES_PER_GROUP(sb); + int avefreei = le32_to_cpu(es->s_free_inodes_count) / ngroups; + int avefreeb = le32_to_cpu(es->s_free_blocks_count) / ngroups; + int blocks_per_dir; + int ndirs = sbi->s_dir_count; + int max_debt, max_dirs, min_blocks, min_inodes; + int group = -1, i; + struct ext2_group_desc *desc; + struct buffer_head *bh; + + if ((parent == sb->s_root->d_inode) || + (parent->i_flags & EXT2_TOPDIR_FL)) { + struct ext2_group_desc *best_desc = NULL; + struct buffer_head *best_bh = NULL; + int best_ndir = inodes_per_group; + int best_group = -1; + + get_random_bytes(&group, sizeof(group)); + parent_group = (unsigned)group % ngroups; + for (i = 0; i < ngroups; i++) { + group = (parent_group + i) % ngroups; + desc = ext2_get_group_desc (sb, group, &bh); + if (!desc || !desc->bg_free_inodes_count) + continue; + if (le16_to_cpu(desc->bg_used_dirs_count) >= best_ndir) + continue; + if (le16_to_cpu(desc->bg_free_inodes_count) < avefreei) + continue; + if (le16_to_cpu(desc->bg_free_blocks_count) < avefreeb) + continue; + best_group = group; + best_ndir = le16_to_cpu(desc->bg_used_dirs_count); + best_desc = desc; + best_bh = bh; + } + if (best_group >= 0) { + desc = best_desc; + bh = best_bh; + group = best_group; + goto found; + } + goto fallback; + } + + blocks_per_dir = (le32_to_cpu(es->s_blocks_count) - + le32_to_cpu(es->s_free_blocks_count)) / ndirs; + + max_dirs = ndirs / ngroups + inodes_per_group / 16; + min_inodes = avefreei - inodes_per_group / 4; + min_blocks = avefreeb - EXT2_BLOCKS_PER_GROUP(sb) / 4; + + max_debt = EXT2_BLOCKS_PER_GROUP(sb) / max(blocks_per_dir, BLOCK_COST); + if (max_debt * INODE_COST > inodes_per_group) + max_debt = inodes_per_group / INODE_COST; + if (max_debt > 255) + max_debt = 255; + if (max_debt == 0) + max_debt = 1; + + for (i = 0; i < ngroups; i++) { + group = (parent_group + i) % ngroups; + desc = ext2_get_group_desc (sb, group, &bh); + if (!desc || !desc->bg_free_inodes_count) + continue; + if (sbi->s_debts[group] >= max_debt) + continue; + if (le16_to_cpu(desc->bg_used_dirs_count) >= max_dirs) + continue; + if (le16_to_cpu(desc->bg_free_inodes_count) < min_inodes) + continue; + if (le16_to_cpu(desc->bg_free_blocks_count) < min_blocks) + continue; + goto found; + } + +fallback: + for (i = 0; i < ngroups; i++) { + group = (parent_group + i) % ngroups; + desc = ext2_get_group_desc (sb, group, &bh); + if (!desc || !desc->bg_free_inodes_count) + continue; + if (le16_to_cpu(desc->bg_free_inodes_count) >= avefreei) + goto found; + } + + return -1; + +found: + desc->bg_free_inodes_count = + cpu_to_le16(le16_to_cpu(desc->bg_free_inodes_count) - 1); + desc->bg_used_dirs_count = + cpu_to_le16(le16_to_cpu(desc->bg_used_dirs_count) + 1); + sbi->s_dir_count++; + mark_buffer_dirty(bh); + return group; +} + +static int find_group_other(struct super_block *sb, const struct inode *parent) { + int parent_group = parent->u.ext2_i.i_block_group; int ngroups = sb->u.ext2_sb.s_groups_count; struct ext2_group_desc *desc; struct buffer_head *bh; @@ -331,10 +463,13 @@ struct inode * ext2_new_inode (const str lock_super (sb); es = sb->u.ext2_sb.s_es; repeat: - if (S_ISDIR(mode)) - group = find_group_dir(sb, dir->u.ext2_i.i_block_group); - else - group = find_group_other(sb, dir->u.ext2_i.i_block_group); + if (S_ISDIR(mode)) { + if (test_opt (sb, OLDALLOC)) + group = find_group_dir(sb, dir); + else + group = find_group_orlov(sb, dir); + } else + group = find_group_other(sb, dir); err = -ENOSPC; if (group == -1) @@ -368,6 +503,15 @@ repeat: es->s_free_inodes_count = cpu_to_le32(le32_to_cpu(es->s_free_inodes_count) - 1); + + if (S_ISDIR(mode)) { + if (EXT2_SB(sb)->s_debts[group] < 255) + EXT2_SB(sb)->s_debts[group]++; + } else { + if (EXT2_SB(sb)->s_debts[group]) + EXT2_SB(sb)->s_debts[group]--; + } + mark_buffer_dirty(sb->u.ext2_sb.s_sbh); sb->s_dirt = 1; inode->i_uid = current->fsuid; @@ -471,6 +615,21 @@ unsigned long ext2_count_free_inodes (st #endif } +/* Called at mount-time, super-block is locked */ +unsigned long ext2_count_dirs (struct super_block * sb) +{ + unsigned long count = 0; + int i; + + for (i = 0; i < EXT2_SB(sb)->s_groups_count; i++) { + struct ext2_group_desc *gdp = ext2_get_group_desc (sb, i, NULL); + if (!gdp) + continue; + count += le16_to_cpu(gdp->bg_used_dirs_count); + } + return count; +} + #ifdef CONFIG_EXT2_CHECK /* Called at mount-time, super-block is locked */ void ext2_check_inodes_bitmap (struct super_block * sb) --- linux-2.4-ext3merge/fs/ext2/super.c.=K0012=.orig 2003-03-13 16:22:45.000000000 +0000 +++ linux-2.4-ext3merge/fs/ext2/super.c 2003-03-14 18:19:13.000000000 +0000 @@ -132,6 +132,7 @@ void ext2_put_super (struct super_block if (sb->u.ext2_sb.s_group_desc[i]) brelse (sb->u.ext2_sb.s_group_desc[i]); kfree(sb->u.ext2_sb.s_group_desc); + kfree(sb->u.ext2_sb.s_debts); for (i = 0; i < EXT2_MAX_GROUP_LOADED; i++) if (sb->u.ext2_sb.s_inode_bitmap[i]) brelse (sb->u.ext2_sb.s_inode_bitmap[i]); @@ -286,6 +287,10 @@ static int parse_options (char * options return 0; sbi->s_resuid = v; } + else if (!strcmp (this_char, "oldalloc")) + set_opt (sbi->s_mount_opt, OLDALLOC); + else if (!strcmp (this_char, "orlov")) + clear_opt (sbi->s_mount_opt, OLDALLOC); /* Silently ignore the quota options */ else if (!strcmp (this_char, "grpquota") || !strcmp (this_char, "noquota") @@ -654,6 +659,13 @@ struct super_block * ext2_read_super (st printk ("EXT2-fs: not enough memory\n"); goto failed_mount; } + sbi->s_debts = kmalloc(sbi->s_groups_count * sizeof(*sbi->s_debts), + GFP_KERNEL); + if (!sbi->s_debts) { + printk ("EXT2-fs: not enough memory\n"); + goto failed_mount_group_desc; + } + memset(sbi->s_debts, 0, sbi->s_groups_count * sizeof(*sbi->s_debts)); for (i = 0; i < db_count; i++) { block = descriptor_loc(sb, logic_sb_block, i); sbi->s_group_desc[i] = sb_bread(sb, block); @@ -662,7 +674,7 @@ struct super_block * ext2_read_super (st brelse (sbi->s_group_desc[j]); kfree(sbi->s_group_desc); printk ("EXT2-fs: unable to read group descriptors\n"); - goto failed_mount; + goto failed_mount_group_desc; } } if (!ext2_check_descriptors (sb)) { @@ -679,6 +691,7 @@ struct super_block * ext2_read_super (st sb->u.ext2_sb.s_loaded_inode_bitmaps = 0; sb->u.ext2_sb.s_loaded_block_bitmaps = 0; sb->u.ext2_sb.s_gdb_count = db_count; + sb->u.ext2_sb.s_dir_count = ext2_count_dirs(sb); /* * set up enough so that it can read an inode */ @@ -699,7 +712,10 @@ struct super_block * ext2_read_super (st failed_mount2: for (i = 0; i < db_count; i++) brelse(sb->u.ext2_sb.s_group_desc[i]); +failed_mount_group_desc: kfree(sb->u.ext2_sb.s_group_desc); + if (sb->u.ext2_sb.s_debts) + kfree(sb->u.ext2_sb.s_debts); failed_mount: brelse(bh); return NULL; --- linux-2.4-ext3merge/fs/ext3/ialloc.c.=K0012=.orig 2003-03-13 16:22:45.000000000 +0000 +++ linux-2.4-ext3merge/fs/ext3/ialloc.c 2003-03-13 16:22:52.000000000 +0000 @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -295,6 +296,199 @@ error_return: * the groups with above-average free space, that group with the fewest * directories already is chosen. * + * For other inodes, search forward from the parent directory\'s block + * group to find a free inode. + */ +static int find_group_dir(struct super_block *sb, const struct inode *parent) +{ + struct ext3_super_block * es = EXT3_SB(sb)->s_es; + int ngroups = EXT3_SB(sb)->s_groups_count; + int avefreei = le32_to_cpu(es->s_free_inodes_count) / ngroups; + struct ext3_group_desc *desc, *best_desc = NULL; + struct buffer_head *bh; + int group, best_group = -1; + + for (group = 0; group < ngroups; group++) { + desc = ext3_get_group_desc (sb, group, &bh); + if (!desc || !desc->bg_free_inodes_count) + continue; + if (le16_to_cpu(desc->bg_free_inodes_count) < avefreei) + continue; + if (!best_desc || + (le16_to_cpu(desc->bg_free_blocks_count) > + le16_to_cpu(best_desc->bg_free_blocks_count))) { + best_group = group; + best_desc = desc; + } + } + return best_group; +} + +/* + * Orlov's allocator for directories. + * + * We always try to spread first-level directories. + * + * If there are blockgroups with both free inodes and free blocks counts + * not worse than average we return one with smallest directory count. + * Otherwise we simply return a random group. + * + * For the rest rules look so: + * + * It's OK to put directory into a group unless + * it has too many directories already (max_dirs) or + * it has too few free inodes left (min_inodes) or + * it has too few free blocks left (min_blocks) or + * it's already running too large debt (max_debt). + * Parent's group is prefered, if it doesn't satisfy these + * conditions we search cyclically through the rest. If none + * of the groups look good we just look for a group with more + * free inodes than average (starting at parent's group). + * + * Debt is incremented each time we allocate a directory and decremented + * when we allocate an inode, within 0--255. + */ + +#define INODE_COST 64 +#define BLOCK_COST 256 + +static int find_group_orlov(struct super_block *sb, const struct inode *parent) +{ + int parent_group = EXT3_I(parent)->i_block_group; + struct ext3_sb_info *sbi = EXT3_SB(sb); + struct ext3_super_block *es = sbi->s_es; + int ngroups = sbi->s_groups_count; + int inodes_per_group = EXT3_INODES_PER_GROUP(sb); + int avefreei = le32_to_cpu(es->s_free_inodes_count) / ngroups; + int avefreeb = le32_to_cpu(es->s_free_blocks_count) / ngroups; + int blocks_per_dir; + int ndirs = sbi->s_dir_count; + int max_debt, max_dirs, min_blocks, min_inodes; + int group = -1, i; + struct ext3_group_desc *desc; + struct buffer_head *bh; + + if ((parent == sb->s_root->d_inode) || + (parent->i_flags & EXT3_TOPDIR_FL)) { + int best_ndir = inodes_per_group; + int best_group = -1; + + get_random_bytes(&group, sizeof(group)); + parent_group = (unsigned)group % ngroups; + for (i = 0; i < ngroups; i++) { + group = (parent_group + i) % ngroups; + desc = ext3_get_group_desc (sb, group, &bh); + if (!desc || !desc->bg_free_inodes_count) + continue; + if (le16_to_cpu(desc->bg_used_dirs_count) >= best_ndir) + continue; + if (le16_to_cpu(desc->bg_free_inodes_count) < avefreei) + continue; + if (le16_to_cpu(desc->bg_free_blocks_count) < avefreeb) + continue; + best_group = group; + best_ndir = le16_to_cpu(desc->bg_used_dirs_count); + } + if (best_group >= 0) + return best_group; + goto fallback; + } + + blocks_per_dir = (le32_to_cpu(es->s_blocks_count) - + le32_to_cpu(es->s_free_blocks_count)) / ndirs; + + max_dirs = ndirs / ngroups + inodes_per_group / 16; + min_inodes = avefreei - inodes_per_group / 4; + min_blocks = avefreeb - EXT3_BLOCKS_PER_GROUP(sb) / 4; + + max_debt = EXT3_BLOCKS_PER_GROUP(sb) / max(blocks_per_dir, BLOCK_COST); + if (max_debt * INODE_COST > inodes_per_group) + max_debt = inodes_per_group / INODE_COST; + if (max_debt > 255) + max_debt = 255; + if (max_debt == 0) + max_debt = 1; + + for (i = 0; i < ngroups; i++) { + group = (parent_group + i) % ngroups; + desc = ext3_get_group_desc (sb, group, &bh); + if (!desc || !desc->bg_free_inodes_count) + continue; + if (sbi->s_debts[group] >= max_debt) + continue; + if (le16_to_cpu(desc->bg_used_dirs_count) >= max_dirs) + continue; + if (le16_to_cpu(desc->bg_free_inodes_count) < min_inodes) + continue; + if (le16_to_cpu(desc->bg_free_blocks_count) < min_blocks) + continue; + return group; + } + +fallback: + for (i = 0; i < ngroups; i++) { + group = (parent_group + i) % ngroups; + desc = ext3_get_group_desc (sb, group, &bh); + if (!desc || !desc->bg_free_inodes_count) + continue; + if (le16_to_cpu(desc->bg_free_inodes_count) >= avefreei) + return group; + } + + return -1; +} + +static int find_group_other(struct super_block *sb, const struct inode *parent) +{ + int parent_group = EXT3_I(parent)->i_block_group; + int ngroups = EXT3_SB(sb)->s_groups_count; + struct ext3_group_desc *desc; + struct buffer_head *bh; + int group, i; + + /* + * Try to place the inode in its parent directory + */ + group = parent_group; + desc = ext3_get_group_desc (sb, group, &bh); + if (desc && le16_to_cpu(desc->bg_free_inodes_count)) + return group; + + /* + * Use a quadratic hash to find a group with a + * free inode + */ + for (i = 1; i < ngroups; i <<= 1) { + group += i; + if (group >= ngroups) + group -= ngroups; + desc = ext3_get_group_desc (sb, group, &bh); + if (desc && le16_to_cpu(desc->bg_free_inodes_count)) + return group; + } + + /* + * That failed: try linear search for a free inode + */ + group = parent_group + 1; + for (i = 2; i < ngroups; i++) { + if (++group >= ngroups) + group = 0; + desc = ext3_get_group_desc (sb, group, &bh); + if (desc && le16_to_cpu(desc->bg_free_inodes_count)) + return group; + } + + return -1; +} + +/* + * There are two policies for allocating an inode. If the new inode is + * a directory, then a forward search is made for a block group with both + * free space and a low directory-to-inode ratio; if that fails, then of + * the groups with above-average free space, that group with the fewest + * directories already is chosen. + * * For other inodes, search forward from the parent directory's block * group to find a free inode. */ @@ -304,11 +498,11 @@ struct inode * ext3_new_inode (handle_t struct super_block * sb; struct buffer_head * bh; struct buffer_head * bh2; - int i, j, avefreei; + int group; + ino_t ino; struct inode * inode; int bitmap_nr; struct ext3_group_desc * gdp; - struct ext3_group_desc * tmp; struct ext3_super_block * es; int err = 0; @@ -325,94 +519,36 @@ struct inode * ext3_new_inode (handle_t lock_super (sb); es = sb->u.ext3_sb.s_es; repeat: - gdp = NULL; - i = 0; - if (S_ISDIR(mode)) { - avefreei = le32_to_cpu(es->s_free_inodes_count) / - sb->u.ext3_sb.s_groups_count; - if (!gdp) { - for (j = 0; j < sb->u.ext3_sb.s_groups_count; j++) { - struct buffer_head *temp_buffer; - tmp = ext3_get_group_desc (sb, j, &temp_buffer); - if (tmp && - le16_to_cpu(tmp->bg_free_inodes_count) && - le16_to_cpu(tmp->bg_free_inodes_count) >= - avefreei) { - if (!gdp || (le16_to_cpu(tmp->bg_free_blocks_count) > - le16_to_cpu(gdp->bg_free_blocks_count))) { - i = j; - gdp = tmp; - bh2 = temp_buffer; - } - } - } - } - } else { - /* - * Try to place the inode in its parent directory - */ - i = dir->u.ext3_i.i_block_group; - tmp = ext3_get_group_desc (sb, i, &bh2); - if (tmp && le16_to_cpu(tmp->bg_free_inodes_count)) - gdp = tmp; + if (test_opt (sb, OLDALLOC)) + group = find_group_dir(sb, dir); else - { - /* - * Use a quadratic hash to find a group with a - * free inode - */ - for (j = 1; j < sb->u.ext3_sb.s_groups_count; j <<= 1) { - i += j; - if (i >= sb->u.ext3_sb.s_groups_count) - i -= sb->u.ext3_sb.s_groups_count; - tmp = ext3_get_group_desc (sb, i, &bh2); - if (tmp && - le16_to_cpu(tmp->bg_free_inodes_count)) { - gdp = tmp; - break; - } - } - } - if (!gdp) { - /* - * That failed: try linear search for a free inode - */ - i = dir->u.ext3_i.i_block_group + 1; - for (j = 2; j < sb->u.ext3_sb.s_groups_count; j++) { - if (++i >= sb->u.ext3_sb.s_groups_count) - i = 0; - tmp = ext3_get_group_desc (sb, i, &bh2); - if (tmp && - le16_to_cpu(tmp->bg_free_inodes_count)) { - gdp = tmp; - break; - } - } - } - } - + group = find_group_orlov(sb, dir); + } else + group = find_group_other(sb, dir); + err = -ENOSPC; - if (!gdp) + if (!group == -1) goto out; err = -EIO; - bitmap_nr = load_inode_bitmap (sb, i); + bitmap_nr = load_inode_bitmap (sb, group); if (bitmap_nr < 0) goto fail; bh = sb->u.ext3_sb.s_inode_bitmap[bitmap_nr]; + gdp = ext3_get_group_desc (sb, group, &bh2); - if ((j = ext3_find_first_zero_bit ((unsigned long *) bh->b_data, + if ((ino = ext3_find_first_zero_bit ((unsigned long *) bh->b_data, EXT3_INODES_PER_GROUP(sb))) < EXT3_INODES_PER_GROUP(sb)) { BUFFER_TRACE(bh, "get_write_access"); err = ext3_journal_get_write_access(handle, bh); if (err) goto fail; - if (ext3_set_bit (j, bh->b_data)) { + if (ext3_set_bit (ino, bh->b_data)) { ext3_error (sb, "ext3_new_inode", - "bit already set for inode %d", j); + "bit already set for inode %lu", ino); goto repeat; } BUFFER_TRACE(bh, "call ext3_journal_dirty_metadata"); @@ -422,7 +558,7 @@ repeat: if (le16_to_cpu(gdp->bg_free_inodes_count) != 0) { ext3_error (sb, "ext3_new_inode", "Free inodes count corrupted in group %d", - i); + group); /* Is it really ENOSPC? */ err = -ENOSPC; if (sb->s_flags & MS_RDONLY) @@ -438,11 +574,11 @@ repeat: } goto repeat; } - j += i * EXT3_INODES_PER_GROUP(sb) + 1; - if (j < EXT3_FIRST_INO(sb) || j > le32_to_cpu(es->s_inodes_count)) { + ino += group * EXT3_INODES_PER_GROUP(sb) + 1; + if (ino < EXT3_FIRST_INO(sb) || ino > le32_to_cpu(es->s_inodes_count)) { ext3_error (sb, "ext3_new_inode", "reserved inode or inode > inodes count - " - "block_group = %d,inode=%d", i, j); + "block_group = %d, inode=%lu", group, ino); err = -EIO; goto fail; } @@ -452,9 +588,11 @@ repeat: if (err) goto fail; gdp->bg_free_inodes_count = cpu_to_le16(le16_to_cpu(gdp->bg_free_inodes_count) - 1); - if (S_ISDIR(mode)) + if (S_ISDIR(mode)) { gdp->bg_used_dirs_count = cpu_to_le16(le16_to_cpu(gdp->bg_used_dirs_count) + 1); + EXT3_SB(sb)->s_dir_count++; + } BUFFER_TRACE(bh2, "call ext3_journal_dirty_metadata"); err = ext3_journal_dirty_metadata(handle, bh2); if (err) goto fail; @@ -480,7 +618,7 @@ repeat: inode->i_gid = current->fsgid; inode->i_mode = mode; - inode->i_ino = j; + inode->i_ino = ino; /* This is the optimal IO size (for stat), not the fs block size */ inode->i_blksize = PAGE_SIZE; inode->i_blocks = 0; @@ -500,7 +638,7 @@ repeat: #ifdef EXT3_PREALLOCATE inode->u.ext3_i.i_prealloc_count = 0; #endif - inode->u.ext3_i.i_block_group = i; + inode->u.ext3_i.i_block_group = group; if (inode->u.ext3_i.i_flags & EXT3_SYNC_FL) inode->i_flags |= S_SYNC; @@ -624,6 +762,21 @@ unsigned long ext3_count_free_inodes (st #endif } +/* Called at mount-time, super-block is locked */ +unsigned long ext3_count_dirs (struct super_block * sb) +{ + unsigned long count = 0; + int i; + + for (i = 0; i < EXT3_SB(sb)->s_groups_count; i++) { + struct ext3_group_desc *gdp = ext3_get_group_desc (sb, i, NULL); + if (!gdp) + continue; + count += le16_to_cpu(gdp->bg_used_dirs_count); + } + return count; +} + #ifdef CONFIG_EXT3_CHECK /* Called at mount-time, super-block is locked */ void ext3_check_inodes_bitmap (struct super_block * sb) --- linux-2.4-ext3merge/fs/ext3/super.c.=K0012=.orig 2003-03-13 16:22:45.000000000 +0000 +++ linux-2.4-ext3merge/fs/ext3/super.c 2003-03-13 16:22:45.000000000 +0000 @@ -389,6 +389,7 @@ void ext3_put_super (struct super_block for (i = 0; i < sbi->s_gdb_count; i++) brelse(sbi->s_group_desc[i]); kfree(sbi->s_group_desc); + kfree(sbi->s_debts); for (i = 0; i < EXT3_MAX_GROUP_LOADED; i++) brelse(sbi->s_inode_bitmap[i]); for (i = 0; i < EXT3_MAX_GROUP_LOADED; i++) @@ -1126,6 +1127,13 @@ struct super_block * ext3_read_super (st printk (KERN_ERR "EXT3-fs: not enough memory\n"); goto failed_mount; } + sbi->s_debts = kmalloc(sbi->s_groups_count * sizeof(*sbi->s_debts), + GFP_KERNEL); + if (!sbi->s_debts) { + printk ("EXT3-fs: not enough memory\n"); + goto failed_mount2; + } + memset(sbi->s_debts, 0, sbi->s_groups_count * sizeof(*sbi->s_debts)); for (i = 0; i < db_count; i++) { block = descriptor_loc(sb, logic_sb_block, i); sbi->s_group_desc[i] = sb_bread(sb, block); @@ -1149,6 +1157,7 @@ struct super_block * ext3_read_super (st sbi->s_loaded_inode_bitmaps = 0; sbi->s_loaded_block_bitmaps = 0; sbi->s_gdb_count = db_count; + sbi->s_dir_count = ext3_count_dirs(sb); get_random_bytes(&sbi->s_next_generation, sizeof(u32)); /* * set up enough so that it can read an inode @@ -1252,6 +1261,8 @@ struct super_block * ext3_read_super (st failed_mount3: journal_destroy(sbi->s_journal); failed_mount2: + if (sbi->s_debts) + kfree(sbi->s_debts); for (i = 0; i < db_count; i++) brelse(sbi->s_group_desc[i]); kfree(sbi->s_group_desc); --- linux-2.4-ext3merge/include/linux/ext2_fs.h.=K0012=.orig 2003-03-13 16:22:45.000000000 +0000 +++ linux-2.4-ext3merge/include/linux/ext2_fs.h 2003-03-13 16:23:13.000000000 +0000 @@ -198,10 +198,11 @@ struct ext2_group_desc #define EXT2_ECOMPR_FL 0x00000800 /* Compression error */ /* End compression flags --- maybe not all used */ #define EXT2_BTREE_FL 0x00001000 /* btree format dir */ +#define EXT2_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/ #define EXT2_RESERVED_FL 0x80000000 /* reserved for ext2 lib */ -#define EXT2_FL_USER_VISIBLE 0x00001FFF /* User visible flags */ -#define EXT2_FL_USER_MODIFIABLE 0x000000FF /* User modifiable flags */ +#define EXT2_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */ +#define EXT2_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */ /* * ioctl commands @@ -307,6 +308,7 @@ struct ext2_inode { * Mount flags */ #define EXT2_MOUNT_CHECK 0x0001 /* Do mount-time checks */ +#define EXT2_MOUNT_OLDALLOC 0x0002 /* Don't use the new Orlov allocator */ #define EXT2_MOUNT_GRPID 0x0004 /* Create files with directory's group */ #define EXT2_MOUNT_DEBUG 0x0008 /* Some debugging messages */ #define EXT2_MOUNT_ERRORS_CONT 0x0010 /* Continue on errors */ @@ -599,6 +601,7 @@ extern int ext2_fsync_inode (struct inod extern struct inode * ext2_new_inode (const struct inode *, int); extern void ext2_free_inode (struct inode *); extern unsigned long ext2_count_free_inodes (struct super_block *); +extern unsigned long ext2_count_dirs (struct super_block *); extern void ext2_check_inodes_bitmap (struct super_block *); extern unsigned long ext2_count_free (struct buffer_head *, unsigned); --- linux-2.4-ext3merge/include/linux/ext2_fs_sb.h.=K0012=.orig 2003-03-13 16:22:45.000000000 +0000 +++ linux-2.4-ext3merge/include/linux/ext2_fs_sb.h 2003-03-14 18:19:13.000000000 +0000 @@ -56,6 +56,8 @@ struct ext2_sb_info { int s_desc_per_block_bits; int s_inode_size; int s_first_ino; + unsigned long s_dir_count; + u8 *s_debts; }; #endif /* _LINUX_EXT2_FS_SB */ --- linux-2.4-ext3merge/include/linux/ext3_fs.h.=K0012=.orig 2003-03-13 16:22:45.000000000 +0000 +++ linux-2.4-ext3merge/include/linux/ext3_fs.h 2003-03-13 16:23:13.000000000 +0000 @@ -208,10 +208,11 @@ struct ext3_group_desc #define EXT3_INDEX_FL 0x00001000 /* hash-indexed directory */ #define EXT3_IMAGIC_FL 0x00002000 /* AFS directory */ #define EXT3_JOURNAL_DATA_FL 0x00004000 /* file data should be journaled */ +#define EXT3_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/ #define EXT3_RESERVED_FL 0x80000000 /* reserved for ext3 lib */ -#define EXT3_FL_USER_VISIBLE 0x00005FFF /* User visible flags */ -#define EXT3_FL_USER_MODIFIABLE 0x000000FF /* User modifiable flags */ +#define EXT3_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */ +#define EXT3_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */ /* * Inode dynamic state flags @@ -330,6 +331,7 @@ struct ext3_inode { * Mount flags */ #define EXT3_MOUNT_CHECK 0x0001 /* Do mount-time checks */ +#define EXT3_MOUNT_OLDALLOC 0x0002 /* Don't use the new Orlov allocator */ #define EXT3_MOUNT_GRPID 0x0004 /* Create files with directory's group */ #define EXT3_MOUNT_DEBUG 0x0008 /* Some debugging messages */ #define EXT3_MOUNT_ERRORS_CONT 0x0010 /* Continue on errors */ @@ -711,6 +713,7 @@ extern struct inode * ext3_new_inode (ha extern void ext3_free_inode (handle_t *, struct inode *); extern struct inode * ext3_orphan_get (struct super_block *, unsigned long); extern unsigned long ext3_count_free_inodes (struct super_block *); +extern unsigned long ext3_count_dirs (struct super_block *); extern void ext3_check_inodes_bitmap (struct super_block *); extern unsigned long ext3_count_free (struct buffer_head *, unsigned); --- linux-2.4-ext3merge/include/linux/ext3_fs_sb.h.=K0012=.orig 2003-03-13 16:22:45.000000000 +0000 +++ linux-2.4-ext3merge/include/linux/ext3_fs_sb.h 2003-03-14 18:19:13.000000000 +0000 @@ -64,6 +64,8 @@ struct ext3_sb_info { u32 s_next_generation; u32 s_hash_seed[4]; int s_def_hash_version; + unsigned long s_dir_count; + u8 *s_debts; /* Journaling */ struct inode * s_journal_inode;