2006-10-11 08:20:50 +00:00
|
|
|
/*
|
2006-10-11 08:20:53 +00:00
|
|
|
* linux/fs/ext4/balloc.c
|
2006-10-11 08:20:50 +00:00
|
|
|
*
|
|
|
|
* Copyright (C) 1992, 1993, 1994, 1995
|
|
|
|
* Remy Card (card@masi.ibp.fr)
|
|
|
|
* Laboratoire MASI - Institut Blaise Pascal
|
|
|
|
* Universite Pierre et Marie Curie (Paris VI)
|
|
|
|
*
|
|
|
|
* Enhanced block allocation by Stephen Tweedie (sct@redhat.com), 1993
|
|
|
|
* Big-endian to little-endian byte-swapping/bitmaps by
|
|
|
|
* David S. Miller (davem@caip.rutgers.edu), 1995
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/time.h>
|
|
|
|
#include <linux/capability.h>
|
|
|
|
#include <linux/fs.h>
|
2006-10-11 08:21:01 +00:00
|
|
|
#include <linux/jbd2.h>
|
2006-10-11 08:20:50 +00:00
|
|
|
#include <linux/quotaops.h>
|
|
|
|
#include <linux/buffer_head.h>
|
2008-04-29 22:13:32 +00:00
|
|
|
#include "ext4.h"
|
|
|
|
#include "ext4_jbd2.h"
|
Ext4: Uninitialized Block Groups
In pass1 of e2fsck, every inode table in the fileystem is scanned and checked,
regardless of whether it is in use. This is this the most time consuming part
of the filesystem check. The unintialized block group feature can greatly
reduce e2fsck time by eliminating checking of uninitialized inodes.
With this feature, there is a a high water mark of used inodes for each block
group. Block and inode bitmaps can be uninitialized on disk via a flag in the
group descriptor to avoid reading or scanning them at e2fsck time. A checksum
of each group descriptor is used to ensure that corruption in the group
descriptor's bit flags does not cause incorrect operation.
The feature is enabled through a mkfs option
mke2fs /dev/ -O uninit_groups
A patch adding support for uninitialized block groups to e2fsprogs tools has
been posted to the linux-ext4 mailing list.
The patches have been stress tested with fsstress and fsx. In performance
tests testing e2fsck time, we have seen that e2fsck time on ext3 grows
linearly with the total number of inodes in the filesytem. In ext4 with the
uninitialized block groups feature, the e2fsck time is constant, based
solely on the number of used inodes rather than the total inode count.
Since typical ext4 filesystems only use 1-10% of their inodes, this feature can
greatly reduce e2fsck time for users. With performance improvement of 2-20
times, depending on how full the filesystem is.
The attached graph shows the major improvements in e2fsck times in filesystems
with a large total inode count, but few inodes in use.
In each group descriptor if we have
EXT4_BG_INODE_UNINIT set in bg_flags:
Inode table is not initialized/used in this group. So we can skip
the consistency check during fsck.
EXT4_BG_BLOCK_UNINIT set in bg_flags:
No block in the group is used. So we can skip the block bitmap
verification for this group.
We also add two new fields to group descriptor as a part of
uninitialized group patch.
__le16 bg_itable_unused; /* Unused inodes count */
__le16 bg_checksum; /* crc16(sb_uuid+group+desc) */
bg_itable_unused:
If we have EXT4_BG_INODE_UNINIT not set in bg_flags
then bg_itable_unused will give the offset within
the inode table till the inodes are used. This can be
used by fsck to skip list of inodes that are marked unused.
bg_checksum:
Now that we depend on bg_flags and bg_itable_unused to determine
the block and inode usage, we need to make sure group descriptor
is not corrupt. We add checksum to group descriptor to
detect corruption. If the descriptor is found to be corrupt, we
mark all the blocks and inodes in the group used.
Signed-off-by: Avantika Mathur <mathur@us.ibm.com>
Signed-off-by: Andreas Dilger <adilger@clusterfs.com>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
2007-10-16 22:38:25 +00:00
|
|
|
#include "group.h"
|
2008-04-29 22:13:32 +00:00
|
|
|
|
2006-10-11 08:20:50 +00:00
|
|
|
/*
|
|
|
|
* balloc.c contains the blocks allocation and deallocation routines
|
|
|
|
*/
|
|
|
|
|
2006-10-11 08:21:18 +00:00
|
|
|
/*
|
|
|
|
* Calculate the block group number and offset, given a block number
|
|
|
|
*/
|
|
|
|
void ext4_get_group_no_and_offset(struct super_block *sb, ext4_fsblk_t blocknr,
|
2008-01-29 04:58:27 +00:00
|
|
|
ext4_group_t *blockgrpp, ext4_grpblk_t *offsetp)
|
2006-10-11 08:21:18 +00:00
|
|
|
{
|
2007-05-24 17:04:54 +00:00
|
|
|
struct ext4_super_block *es = EXT4_SB(sb)->s_es;
|
2006-10-11 08:21:18 +00:00
|
|
|
ext4_grpblk_t offset;
|
|
|
|
|
2007-05-24 17:04:54 +00:00
|
|
|
blocknr = blocknr - le32_to_cpu(es->s_first_data_block);
|
2006-10-11 08:21:19 +00:00
|
|
|
offset = do_div(blocknr, EXT4_BLOCKS_PER_GROUP(sb));
|
2006-10-11 08:21:18 +00:00
|
|
|
if (offsetp)
|
|
|
|
*offsetp = offset;
|
|
|
|
if (blockgrpp)
|
2007-05-24 17:04:54 +00:00
|
|
|
*blockgrpp = blocknr;
|
2006-10-11 08:21:18 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
2008-06-03 18:07:29 +00:00
|
|
|
static int ext4_block_in_group(struct super_block *sb, ext4_fsblk_t block,
|
|
|
|
ext4_group_t block_group)
|
|
|
|
{
|
|
|
|
ext4_group_t actual_group;
|
2008-07-11 23:27:31 +00:00
|
|
|
ext4_get_group_no_and_offset(sb, block, &actual_group, NULL);
|
2008-06-03 18:07:29 +00:00
|
|
|
if (actual_group == block_group)
|
|
|
|
return 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ext4_group_used_meta_blocks(struct super_block *sb,
|
|
|
|
ext4_group_t block_group)
|
|
|
|
{
|
|
|
|
ext4_fsblk_t tmp;
|
|
|
|
struct ext4_sb_info *sbi = EXT4_SB(sb);
|
|
|
|
/* block bitmap, inode bitmap, and inode table blocks */
|
|
|
|
int used_blocks = sbi->s_itb_per_group + 2;
|
|
|
|
|
|
|
|
if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_FLEX_BG)) {
|
|
|
|
struct ext4_group_desc *gdp;
|
|
|
|
struct buffer_head *bh;
|
|
|
|
|
|
|
|
gdp = ext4_get_group_desc(sb, block_group, &bh);
|
|
|
|
if (!ext4_block_in_group(sb, ext4_block_bitmap(sb, gdp),
|
|
|
|
block_group))
|
|
|
|
used_blocks--;
|
|
|
|
|
|
|
|
if (!ext4_block_in_group(sb, ext4_inode_bitmap(sb, gdp),
|
|
|
|
block_group))
|
|
|
|
used_blocks--;
|
|
|
|
|
|
|
|
tmp = ext4_inode_table(sb, gdp);
|
|
|
|
for (; tmp < ext4_inode_table(sb, gdp) +
|
|
|
|
sbi->s_itb_per_group; tmp++) {
|
|
|
|
if (!ext4_block_in_group(sb, tmp, block_group))
|
|
|
|
used_blocks -= 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return used_blocks;
|
|
|
|
}
|
2008-10-10 13:40:52 +00:00
|
|
|
|
Ext4: Uninitialized Block Groups
In pass1 of e2fsck, every inode table in the fileystem is scanned and checked,
regardless of whether it is in use. This is this the most time consuming part
of the filesystem check. The unintialized block group feature can greatly
reduce e2fsck time by eliminating checking of uninitialized inodes.
With this feature, there is a a high water mark of used inodes for each block
group. Block and inode bitmaps can be uninitialized on disk via a flag in the
group descriptor to avoid reading or scanning them at e2fsck time. A checksum
of each group descriptor is used to ensure that corruption in the group
descriptor's bit flags does not cause incorrect operation.
The feature is enabled through a mkfs option
mke2fs /dev/ -O uninit_groups
A patch adding support for uninitialized block groups to e2fsprogs tools has
been posted to the linux-ext4 mailing list.
The patches have been stress tested with fsstress and fsx. In performance
tests testing e2fsck time, we have seen that e2fsck time on ext3 grows
linearly with the total number of inodes in the filesytem. In ext4 with the
uninitialized block groups feature, the e2fsck time is constant, based
solely on the number of used inodes rather than the total inode count.
Since typical ext4 filesystems only use 1-10% of their inodes, this feature can
greatly reduce e2fsck time for users. With performance improvement of 2-20
times, depending on how full the filesystem is.
The attached graph shows the major improvements in e2fsck times in filesystems
with a large total inode count, but few inodes in use.
In each group descriptor if we have
EXT4_BG_INODE_UNINIT set in bg_flags:
Inode table is not initialized/used in this group. So we can skip
the consistency check during fsck.
EXT4_BG_BLOCK_UNINIT set in bg_flags:
No block in the group is used. So we can skip the block bitmap
verification for this group.
We also add two new fields to group descriptor as a part of
uninitialized group patch.
__le16 bg_itable_unused; /* Unused inodes count */
__le16 bg_checksum; /* crc16(sb_uuid+group+desc) */
bg_itable_unused:
If we have EXT4_BG_INODE_UNINIT not set in bg_flags
then bg_itable_unused will give the offset within
the inode table till the inodes are used. This can be
used by fsck to skip list of inodes that are marked unused.
bg_checksum:
Now that we depend on bg_flags and bg_itable_unused to determine
the block and inode usage, we need to make sure group descriptor
is not corrupt. We add checksum to group descriptor to
detect corruption. If the descriptor is found to be corrupt, we
mark all the blocks and inodes in the group used.
Signed-off-by: Avantika Mathur <mathur@us.ibm.com>
Signed-off-by: Andreas Dilger <adilger@clusterfs.com>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
2007-10-16 22:38:25 +00:00
|
|
|
/* Initializes an uninitialized block bitmap if given, and returns the
|
|
|
|
* number of blocks free in the group. */
|
|
|
|
unsigned ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh,
|
2008-01-29 04:58:27 +00:00
|
|
|
ext4_group_t block_group, struct ext4_group_desc *gdp)
|
Ext4: Uninitialized Block Groups
In pass1 of e2fsck, every inode table in the fileystem is scanned and checked,
regardless of whether it is in use. This is this the most time consuming part
of the filesystem check. The unintialized block group feature can greatly
reduce e2fsck time by eliminating checking of uninitialized inodes.
With this feature, there is a a high water mark of used inodes for each block
group. Block and inode bitmaps can be uninitialized on disk via a flag in the
group descriptor to avoid reading or scanning them at e2fsck time. A checksum
of each group descriptor is used to ensure that corruption in the group
descriptor's bit flags does not cause incorrect operation.
The feature is enabled through a mkfs option
mke2fs /dev/ -O uninit_groups
A patch adding support for uninitialized block groups to e2fsprogs tools has
been posted to the linux-ext4 mailing list.
The patches have been stress tested with fsstress and fsx. In performance
tests testing e2fsck time, we have seen that e2fsck time on ext3 grows
linearly with the total number of inodes in the filesytem. In ext4 with the
uninitialized block groups feature, the e2fsck time is constant, based
solely on the number of used inodes rather than the total inode count.
Since typical ext4 filesystems only use 1-10% of their inodes, this feature can
greatly reduce e2fsck time for users. With performance improvement of 2-20
times, depending on how full the filesystem is.
The attached graph shows the major improvements in e2fsck times in filesystems
with a large total inode count, but few inodes in use.
In each group descriptor if we have
EXT4_BG_INODE_UNINIT set in bg_flags:
Inode table is not initialized/used in this group. So we can skip
the consistency check during fsck.
EXT4_BG_BLOCK_UNINIT set in bg_flags:
No block in the group is used. So we can skip the block bitmap
verification for this group.
We also add two new fields to group descriptor as a part of
uninitialized group patch.
__le16 bg_itable_unused; /* Unused inodes count */
__le16 bg_checksum; /* crc16(sb_uuid+group+desc) */
bg_itable_unused:
If we have EXT4_BG_INODE_UNINIT not set in bg_flags
then bg_itable_unused will give the offset within
the inode table till the inodes are used. This can be
used by fsck to skip list of inodes that are marked unused.
bg_checksum:
Now that we depend on bg_flags and bg_itable_unused to determine
the block and inode usage, we need to make sure group descriptor
is not corrupt. We add checksum to group descriptor to
detect corruption. If the descriptor is found to be corrupt, we
mark all the blocks and inodes in the group used.
Signed-off-by: Avantika Mathur <mathur@us.ibm.com>
Signed-off-by: Andreas Dilger <adilger@clusterfs.com>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
2007-10-16 22:38:25 +00:00
|
|
|
{
|
|
|
|
int bit, bit_max;
|
|
|
|
unsigned free_blocks, group_blocks;
|
|
|
|
struct ext4_sb_info *sbi = EXT4_SB(sb);
|
|
|
|
|
|
|
|
if (bh) {
|
|
|
|
J_ASSERT_BH(bh, buffer_locked(bh));
|
|
|
|
|
|
|
|
/* If checksum is bad mark all blocks used to prevent allocation
|
|
|
|
* essentially implementing a per-group read-only flag. */
|
|
|
|
if (!ext4_group_desc_csum_verify(sbi, block_group, gdp)) {
|
2008-04-17 14:38:59 +00:00
|
|
|
ext4_error(sb, __func__,
|
2008-01-29 04:58:27 +00:00
|
|
|
"Checksum bad for group %lu\n", block_group);
|
Ext4: Uninitialized Block Groups
In pass1 of e2fsck, every inode table in the fileystem is scanned and checked,
regardless of whether it is in use. This is this the most time consuming part
of the filesystem check. The unintialized block group feature can greatly
reduce e2fsck time by eliminating checking of uninitialized inodes.
With this feature, there is a a high water mark of used inodes for each block
group. Block and inode bitmaps can be uninitialized on disk via a flag in the
group descriptor to avoid reading or scanning them at e2fsck time. A checksum
of each group descriptor is used to ensure that corruption in the group
descriptor's bit flags does not cause incorrect operation.
The feature is enabled through a mkfs option
mke2fs /dev/ -O uninit_groups
A patch adding support for uninitialized block groups to e2fsprogs tools has
been posted to the linux-ext4 mailing list.
The patches have been stress tested with fsstress and fsx. In performance
tests testing e2fsck time, we have seen that e2fsck time on ext3 grows
linearly with the total number of inodes in the filesytem. In ext4 with the
uninitialized block groups feature, the e2fsck time is constant, based
solely on the number of used inodes rather than the total inode count.
Since typical ext4 filesystems only use 1-10% of their inodes, this feature can
greatly reduce e2fsck time for users. With performance improvement of 2-20
times, depending on how full the filesystem is.
The attached graph shows the major improvements in e2fsck times in filesystems
with a large total inode count, but few inodes in use.
In each group descriptor if we have
EXT4_BG_INODE_UNINIT set in bg_flags:
Inode table is not initialized/used in this group. So we can skip
the consistency check during fsck.
EXT4_BG_BLOCK_UNINIT set in bg_flags:
No block in the group is used. So we can skip the block bitmap
verification for this group.
We also add two new fields to group descriptor as a part of
uninitialized group patch.
__le16 bg_itable_unused; /* Unused inodes count */
__le16 bg_checksum; /* crc16(sb_uuid+group+desc) */
bg_itable_unused:
If we have EXT4_BG_INODE_UNINIT not set in bg_flags
then bg_itable_unused will give the offset within
the inode table till the inodes are used. This can be
used by fsck to skip list of inodes that are marked unused.
bg_checksum:
Now that we depend on bg_flags and bg_itable_unused to determine
the block and inode usage, we need to make sure group descriptor
is not corrupt. We add checksum to group descriptor to
detect corruption. If the descriptor is found to be corrupt, we
mark all the blocks and inodes in the group used.
Signed-off-by: Avantika Mathur <mathur@us.ibm.com>
Signed-off-by: Andreas Dilger <adilger@clusterfs.com>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
2007-10-16 22:38:25 +00:00
|
|
|
gdp->bg_free_blocks_count = 0;
|
|
|
|
gdp->bg_free_inodes_count = 0;
|
|
|
|
gdp->bg_itable_unused = 0;
|
|
|
|
memset(bh->b_data, 0xff, sb->s_blocksize);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
memset(bh->b_data, 0, sb->s_blocksize);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check for superblock and gdt backups in this group */
|
|
|
|
bit_max = ext4_bg_has_super(sb, block_group);
|
|
|
|
|
|
|
|
if (!EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_META_BG) ||
|
|
|
|
block_group < le32_to_cpu(sbi->s_es->s_first_meta_bg) *
|
|
|
|
sbi->s_desc_per_block) {
|
|
|
|
if (bit_max) {
|
|
|
|
bit_max += ext4_bg_num_gdb(sb, block_group);
|
|
|
|
bit_max +=
|
|
|
|
le16_to_cpu(sbi->s_es->s_reserved_gdt_blocks);
|
|
|
|
}
|
|
|
|
} else { /* For META_BG_BLOCK_GROUPS */
|
2008-07-11 23:27:31 +00:00
|
|
|
bit_max += ext4_bg_num_gdb(sb, block_group);
|
Ext4: Uninitialized Block Groups
In pass1 of e2fsck, every inode table in the fileystem is scanned and checked,
regardless of whether it is in use. This is this the most time consuming part
of the filesystem check. The unintialized block group feature can greatly
reduce e2fsck time by eliminating checking of uninitialized inodes.
With this feature, there is a a high water mark of used inodes for each block
group. Block and inode bitmaps can be uninitialized on disk via a flag in the
group descriptor to avoid reading or scanning them at e2fsck time. A checksum
of each group descriptor is used to ensure that corruption in the group
descriptor's bit flags does not cause incorrect operation.
The feature is enabled through a mkfs option
mke2fs /dev/ -O uninit_groups
A patch adding support for uninitialized block groups to e2fsprogs tools has
been posted to the linux-ext4 mailing list.
The patches have been stress tested with fsstress and fsx. In performance
tests testing e2fsck time, we have seen that e2fsck time on ext3 grows
linearly with the total number of inodes in the filesytem. In ext4 with the
uninitialized block groups feature, the e2fsck time is constant, based
solely on the number of used inodes rather than the total inode count.
Since typical ext4 filesystems only use 1-10% of their inodes, this feature can
greatly reduce e2fsck time for users. With performance improvement of 2-20
times, depending on how full the filesystem is.
The attached graph shows the major improvements in e2fsck times in filesystems
with a large total inode count, but few inodes in use.
In each group descriptor if we have
EXT4_BG_INODE_UNINIT set in bg_flags:
Inode table is not initialized/used in this group. So we can skip
the consistency check during fsck.
EXT4_BG_BLOCK_UNINIT set in bg_flags:
No block in the group is used. So we can skip the block bitmap
verification for this group.
We also add two new fields to group descriptor as a part of
uninitialized group patch.
__le16 bg_itable_unused; /* Unused inodes count */
__le16 bg_checksum; /* crc16(sb_uuid+group+desc) */
bg_itable_unused:
If we have EXT4_BG_INODE_UNINIT not set in bg_flags
then bg_itable_unused will give the offset within
the inode table till the inodes are used. This can be
used by fsck to skip list of inodes that are marked unused.
bg_checksum:
Now that we depend on bg_flags and bg_itable_unused to determine
the block and inode usage, we need to make sure group descriptor
is not corrupt. We add checksum to group descriptor to
detect corruption. If the descriptor is found to be corrupt, we
mark all the blocks and inodes in the group used.
Signed-off-by: Avantika Mathur <mathur@us.ibm.com>
Signed-off-by: Andreas Dilger <adilger@clusterfs.com>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
2007-10-16 22:38:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (block_group == sbi->s_groups_count - 1) {
|
|
|
|
/*
|
|
|
|
* Even though mke2fs always initialize first and last group
|
|
|
|
* if some other tool enabled the EXT4_BG_BLOCK_UNINIT we need
|
|
|
|
* to make sure we calculate the right free blocks
|
|
|
|
*/
|
|
|
|
group_blocks = ext4_blocks_count(sbi->s_es) -
|
|
|
|
le32_to_cpu(sbi->s_es->s_first_data_block) -
|
2008-09-09 02:25:24 +00:00
|
|
|
(EXT4_BLOCKS_PER_GROUP(sb) * (sbi->s_groups_count - 1));
|
Ext4: Uninitialized Block Groups
In pass1 of e2fsck, every inode table in the fileystem is scanned and checked,
regardless of whether it is in use. This is this the most time consuming part
of the filesystem check. The unintialized block group feature can greatly
reduce e2fsck time by eliminating checking of uninitialized inodes.
With this feature, there is a a high water mark of used inodes for each block
group. Block and inode bitmaps can be uninitialized on disk via a flag in the
group descriptor to avoid reading or scanning them at e2fsck time. A checksum
of each group descriptor is used to ensure that corruption in the group
descriptor's bit flags does not cause incorrect operation.
The feature is enabled through a mkfs option
mke2fs /dev/ -O uninit_groups
A patch adding support for uninitialized block groups to e2fsprogs tools has
been posted to the linux-ext4 mailing list.
The patches have been stress tested with fsstress and fsx. In performance
tests testing e2fsck time, we have seen that e2fsck time on ext3 grows
linearly with the total number of inodes in the filesytem. In ext4 with the
uninitialized block groups feature, the e2fsck time is constant, based
solely on the number of used inodes rather than the total inode count.
Since typical ext4 filesystems only use 1-10% of their inodes, this feature can
greatly reduce e2fsck time for users. With performance improvement of 2-20
times, depending on how full the filesystem is.
The attached graph shows the major improvements in e2fsck times in filesystems
with a large total inode count, but few inodes in use.
In each group descriptor if we have
EXT4_BG_INODE_UNINIT set in bg_flags:
Inode table is not initialized/used in this group. So we can skip
the consistency check during fsck.
EXT4_BG_BLOCK_UNINIT set in bg_flags:
No block in the group is used. So we can skip the block bitmap
verification for this group.
We also add two new fields to group descriptor as a part of
uninitialized group patch.
__le16 bg_itable_unused; /* Unused inodes count */
__le16 bg_checksum; /* crc16(sb_uuid+group+desc) */
bg_itable_unused:
If we have EXT4_BG_INODE_UNINIT not set in bg_flags
then bg_itable_unused will give the offset within
the inode table till the inodes are used. This can be
used by fsck to skip list of inodes that are marked unused.
bg_checksum:
Now that we depend on bg_flags and bg_itable_unused to determine
the block and inode usage, we need to make sure group descriptor
is not corrupt. We add checksum to group descriptor to
detect corruption. If the descriptor is found to be corrupt, we
mark all the blocks and inodes in the group used.
Signed-off-by: Avantika Mathur <mathur@us.ibm.com>
Signed-off-by: Andreas Dilger <adilger@clusterfs.com>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
2007-10-16 22:38:25 +00:00
|
|
|
} else {
|
|
|
|
group_blocks = EXT4_BLOCKS_PER_GROUP(sb);
|
|
|
|
}
|
|
|
|
|
|
|
|
free_blocks = group_blocks - bit_max;
|
|
|
|
|
|
|
|
if (bh) {
|
2008-06-03 18:07:29 +00:00
|
|
|
ext4_fsblk_t start, tmp;
|
|
|
|
int flex_bg = 0;
|
2008-04-17 14:38:59 +00:00
|
|
|
|
Ext4: Uninitialized Block Groups
In pass1 of e2fsck, every inode table in the fileystem is scanned and checked,
regardless of whether it is in use. This is this the most time consuming part
of the filesystem check. The unintialized block group feature can greatly
reduce e2fsck time by eliminating checking of uninitialized inodes.
With this feature, there is a a high water mark of used inodes for each block
group. Block and inode bitmaps can be uninitialized on disk via a flag in the
group descriptor to avoid reading or scanning them at e2fsck time. A checksum
of each group descriptor is used to ensure that corruption in the group
descriptor's bit flags does not cause incorrect operation.
The feature is enabled through a mkfs option
mke2fs /dev/ -O uninit_groups
A patch adding support for uninitialized block groups to e2fsprogs tools has
been posted to the linux-ext4 mailing list.
The patches have been stress tested with fsstress and fsx. In performance
tests testing e2fsck time, we have seen that e2fsck time on ext3 grows
linearly with the total number of inodes in the filesytem. In ext4 with the
uninitialized block groups feature, the e2fsck time is constant, based
solely on the number of used inodes rather than the total inode count.
Since typical ext4 filesystems only use 1-10% of their inodes, this feature can
greatly reduce e2fsck time for users. With performance improvement of 2-20
times, depending on how full the filesystem is.
The attached graph shows the major improvements in e2fsck times in filesystems
with a large total inode count, but few inodes in use.
In each group descriptor if we have
EXT4_BG_INODE_UNINIT set in bg_flags:
Inode table is not initialized/used in this group. So we can skip
the consistency check during fsck.
EXT4_BG_BLOCK_UNINIT set in bg_flags:
No block in the group is used. So we can skip the block bitmap
verification for this group.
We also add two new fields to group descriptor as a part of
uninitialized group patch.
__le16 bg_itable_unused; /* Unused inodes count */
__le16 bg_checksum; /* crc16(sb_uuid+group+desc) */
bg_itable_unused:
If we have EXT4_BG_INODE_UNINIT not set in bg_flags
then bg_itable_unused will give the offset within
the inode table till the inodes are used. This can be
used by fsck to skip list of inodes that are marked unused.
bg_checksum:
Now that we depend on bg_flags and bg_itable_unused to determine
the block and inode usage, we need to make sure group descriptor
is not corrupt. We add checksum to group descriptor to
detect corruption. If the descriptor is found to be corrupt, we
mark all the blocks and inodes in the group used.
Signed-off-by: Avantika Mathur <mathur@us.ibm.com>
Signed-off-by: Andreas Dilger <adilger@clusterfs.com>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
2007-10-16 22:38:25 +00:00
|
|
|
for (bit = 0; bit < bit_max; bit++)
|
|
|
|
ext4_set_bit(bit, bh->b_data);
|
|
|
|
|
2008-04-17 14:38:59 +00:00
|
|
|
start = ext4_group_first_block_no(sb, block_group);
|
Ext4: Uninitialized Block Groups
In pass1 of e2fsck, every inode table in the fileystem is scanned and checked,
regardless of whether it is in use. This is this the most time consuming part
of the filesystem check. The unintialized block group feature can greatly
reduce e2fsck time by eliminating checking of uninitialized inodes.
With this feature, there is a a high water mark of used inodes for each block
group. Block and inode bitmaps can be uninitialized on disk via a flag in the
group descriptor to avoid reading or scanning them at e2fsck time. A checksum
of each group descriptor is used to ensure that corruption in the group
descriptor's bit flags does not cause incorrect operation.
The feature is enabled through a mkfs option
mke2fs /dev/ -O uninit_groups
A patch adding support for uninitialized block groups to e2fsprogs tools has
been posted to the linux-ext4 mailing list.
The patches have been stress tested with fsstress and fsx. In performance
tests testing e2fsck time, we have seen that e2fsck time on ext3 grows
linearly with the total number of inodes in the filesytem. In ext4 with the
uninitialized block groups feature, the e2fsck time is constant, based
solely on the number of used inodes rather than the total inode count.
Since typical ext4 filesystems only use 1-10% of their inodes, this feature can
greatly reduce e2fsck time for users. With performance improvement of 2-20
times, depending on how full the filesystem is.
The attached graph shows the major improvements in e2fsck times in filesystems
with a large total inode count, but few inodes in use.
In each group descriptor if we have
EXT4_BG_INODE_UNINIT set in bg_flags:
Inode table is not initialized/used in this group. So we can skip
the consistency check during fsck.
EXT4_BG_BLOCK_UNINIT set in bg_flags:
No block in the group is used. So we can skip the block bitmap
verification for this group.
We also add two new fields to group descriptor as a part of
uninitialized group patch.
__le16 bg_itable_unused; /* Unused inodes count */
__le16 bg_checksum; /* crc16(sb_uuid+group+desc) */
bg_itable_unused:
If we have EXT4_BG_INODE_UNINIT not set in bg_flags
then bg_itable_unused will give the offset within
the inode table till the inodes are used. This can be
used by fsck to skip list of inodes that are marked unused.
bg_checksum:
Now that we depend on bg_flags and bg_itable_unused to determine
the block and inode usage, we need to make sure group descriptor
is not corrupt. We add checksum to group descriptor to
detect corruption. If the descriptor is found to be corrupt, we
mark all the blocks and inodes in the group used.
Signed-off-by: Avantika Mathur <mathur@us.ibm.com>
Signed-off-by: Andreas Dilger <adilger@clusterfs.com>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
2007-10-16 22:38:25 +00:00
|
|
|
|
2008-06-03 18:07:29 +00:00
|
|
|
if (EXT4_HAS_INCOMPAT_FEATURE(sb,
|
|
|
|
EXT4_FEATURE_INCOMPAT_FLEX_BG))
|
|
|
|
flex_bg = 1;
|
Ext4: Uninitialized Block Groups
In pass1 of e2fsck, every inode table in the fileystem is scanned and checked,
regardless of whether it is in use. This is this the most time consuming part
of the filesystem check. The unintialized block group feature can greatly
reduce e2fsck time by eliminating checking of uninitialized inodes.
With this feature, there is a a high water mark of used inodes for each block
group. Block and inode bitmaps can be uninitialized on disk via a flag in the
group descriptor to avoid reading or scanning them at e2fsck time. A checksum
of each group descriptor is used to ensure that corruption in the group
descriptor's bit flags does not cause incorrect operation.
The feature is enabled through a mkfs option
mke2fs /dev/ -O uninit_groups
A patch adding support for uninitialized block groups to e2fsprogs tools has
been posted to the linux-ext4 mailing list.
The patches have been stress tested with fsstress and fsx. In performance
tests testing e2fsck time, we have seen that e2fsck time on ext3 grows
linearly with the total number of inodes in the filesytem. In ext4 with the
uninitialized block groups feature, the e2fsck time is constant, based
solely on the number of used inodes rather than the total inode count.
Since typical ext4 filesystems only use 1-10% of their inodes, this feature can
greatly reduce e2fsck time for users. With performance improvement of 2-20
times, depending on how full the filesystem is.
The attached graph shows the major improvements in e2fsck times in filesystems
with a large total inode count, but few inodes in use.
In each group descriptor if we have
EXT4_BG_INODE_UNINIT set in bg_flags:
Inode table is not initialized/used in this group. So we can skip
the consistency check during fsck.
EXT4_BG_BLOCK_UNINIT set in bg_flags:
No block in the group is used. So we can skip the block bitmap
verification for this group.
We also add two new fields to group descriptor as a part of
uninitialized group patch.
__le16 bg_itable_unused; /* Unused inodes count */
__le16 bg_checksum; /* crc16(sb_uuid+group+desc) */
bg_itable_unused:
If we have EXT4_BG_INODE_UNINIT not set in bg_flags
then bg_itable_unused will give the offset within
the inode table till the inodes are used. This can be
used by fsck to skip list of inodes that are marked unused.
bg_checksum:
Now that we depend on bg_flags and bg_itable_unused to determine
the block and inode usage, we need to make sure group descriptor
is not corrupt. We add checksum to group descriptor to
detect corruption. If the descriptor is found to be corrupt, we
mark all the blocks and inodes in the group used.
Signed-off-by: Avantika Mathur <mathur@us.ibm.com>
Signed-off-by: Andreas Dilger <adilger@clusterfs.com>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
2007-10-16 22:38:25 +00:00
|
|
|
|
2008-06-03 18:07:29 +00:00
|
|
|
/* Set bits for block and inode bitmaps, and inode table */
|
|
|
|
tmp = ext4_block_bitmap(sb, gdp);
|
|
|
|
if (!flex_bg || ext4_block_in_group(sb, tmp, block_group))
|
|
|
|
ext4_set_bit(tmp - start, bh->b_data);
|
|
|
|
|
|
|
|
tmp = ext4_inode_bitmap(sb, gdp);
|
|
|
|
if (!flex_bg || ext4_block_in_group(sb, tmp, block_group))
|
|
|
|
ext4_set_bit(tmp - start, bh->b_data);
|
|
|
|
|
|
|
|
tmp = ext4_inode_table(sb, gdp);
|
|
|
|
for (; tmp < ext4_inode_table(sb, gdp) +
|
|
|
|
sbi->s_itb_per_group; tmp++) {
|
|
|
|
if (!flex_bg ||
|
|
|
|
ext4_block_in_group(sb, tmp, block_group))
|
|
|
|
ext4_set_bit(tmp - start, bh->b_data);
|
|
|
|
}
|
Ext4: Uninitialized Block Groups
In pass1 of e2fsck, every inode table in the fileystem is scanned and checked,
regardless of whether it is in use. This is this the most time consuming part
of the filesystem check. The unintialized block group feature can greatly
reduce e2fsck time by eliminating checking of uninitialized inodes.
With this feature, there is a a high water mark of used inodes for each block
group. Block and inode bitmaps can be uninitialized on disk via a flag in the
group descriptor to avoid reading or scanning them at e2fsck time. A checksum
of each group descriptor is used to ensure that corruption in the group
descriptor's bit flags does not cause incorrect operation.
The feature is enabled through a mkfs option
mke2fs /dev/ -O uninit_groups
A patch adding support for uninitialized block groups to e2fsprogs tools has
been posted to the linux-ext4 mailing list.
The patches have been stress tested with fsstress and fsx. In performance
tests testing e2fsck time, we have seen that e2fsck time on ext3 grows
linearly with the total number of inodes in the filesytem. In ext4 with the
uninitialized block groups feature, the e2fsck time is constant, based
solely on the number of used inodes rather than the total inode count.
Since typical ext4 filesystems only use 1-10% of their inodes, this feature can
greatly reduce e2fsck time for users. With performance improvement of 2-20
times, depending on how full the filesystem is.
The attached graph shows the major improvements in e2fsck times in filesystems
with a large total inode count, but few inodes in use.
In each group descriptor if we have
EXT4_BG_INODE_UNINIT set in bg_flags:
Inode table is not initialized/used in this group. So we can skip
the consistency check during fsck.
EXT4_BG_BLOCK_UNINIT set in bg_flags:
No block in the group is used. So we can skip the block bitmap
verification for this group.
We also add two new fields to group descriptor as a part of
uninitialized group patch.
__le16 bg_itable_unused; /* Unused inodes count */
__le16 bg_checksum; /* crc16(sb_uuid+group+desc) */
bg_itable_unused:
If we have EXT4_BG_INODE_UNINIT not set in bg_flags
then bg_itable_unused will give the offset within
the inode table till the inodes are used. This can be
used by fsck to skip list of inodes that are marked unused.
bg_checksum:
Now that we depend on bg_flags and bg_itable_unused to determine
the block and inode usage, we need to make sure group descriptor
is not corrupt. We add checksum to group descriptor to
detect corruption. If the descriptor is found to be corrupt, we
mark all the blocks and inodes in the group used.
Signed-off-by: Avantika Mathur <mathur@us.ibm.com>
Signed-off-by: Andreas Dilger <adilger@clusterfs.com>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
2007-10-16 22:38:25 +00:00
|
|
|
/*
|
|
|
|
* 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(group_blocks, sb->s_blocksize * 8, bh->b_data);
|
|
|
|
}
|
2008-06-03 18:07:29 +00:00
|
|
|
return free_blocks - ext4_group_used_meta_blocks(sb, block_group);
|
Ext4: Uninitialized Block Groups
In pass1 of e2fsck, every inode table in the fileystem is scanned and checked,
regardless of whether it is in use. This is this the most time consuming part
of the filesystem check. The unintialized block group feature can greatly
reduce e2fsck time by eliminating checking of uninitialized inodes.
With this feature, there is a a high water mark of used inodes for each block
group. Block and inode bitmaps can be uninitialized on disk via a flag in the
group descriptor to avoid reading or scanning them at e2fsck time. A checksum
of each group descriptor is used to ensure that corruption in the group
descriptor's bit flags does not cause incorrect operation.
The feature is enabled through a mkfs option
mke2fs /dev/ -O uninit_groups
A patch adding support for uninitialized block groups to e2fsprogs tools has
been posted to the linux-ext4 mailing list.
The patches have been stress tested with fsstress and fsx. In performance
tests testing e2fsck time, we have seen that e2fsck time on ext3 grows
linearly with the total number of inodes in the filesytem. In ext4 with the
uninitialized block groups feature, the e2fsck time is constant, based
solely on the number of used inodes rather than the total inode count.
Since typical ext4 filesystems only use 1-10% of their inodes, this feature can
greatly reduce e2fsck time for users. With performance improvement of 2-20
times, depending on how full the filesystem is.
The attached graph shows the major improvements in e2fsck times in filesystems
with a large total inode count, but few inodes in use.
In each group descriptor if we have
EXT4_BG_INODE_UNINIT set in bg_flags:
Inode table is not initialized/used in this group. So we can skip
the consistency check during fsck.
EXT4_BG_BLOCK_UNINIT set in bg_flags:
No block in the group is used. So we can skip the block bitmap
verification for this group.
We also add two new fields to group descriptor as a part of
uninitialized group patch.
__le16 bg_itable_unused; /* Unused inodes count */
__le16 bg_checksum; /* crc16(sb_uuid+group+desc) */
bg_itable_unused:
If we have EXT4_BG_INODE_UNINIT not set in bg_flags
then bg_itable_unused will give the offset within
the inode table till the inodes are used. This can be
used by fsck to skip list of inodes that are marked unused.
bg_checksum:
Now that we depend on bg_flags and bg_itable_unused to determine
the block and inode usage, we need to make sure group descriptor
is not corrupt. We add checksum to group descriptor to
detect corruption. If the descriptor is found to be corrupt, we
mark all the blocks and inodes in the group used.
Signed-off-by: Avantika Mathur <mathur@us.ibm.com>
Signed-off-by: Andreas Dilger <adilger@clusterfs.com>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
2007-10-16 22:38:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-10-11 08:20:50 +00:00
|
|
|
/*
|
|
|
|
* The free blocks are managed by bitmaps. A file system contains several
|
|
|
|
* blocks groups. Each group contains 1 bitmap block for blocks, 1 bitmap
|
|
|
|
* block for inodes, N blocks for the inode table and data blocks.
|
|
|
|
*
|
|
|
|
* The file system contains group descriptors which are located after the
|
|
|
|
* super block. Each descriptor contains the number of the bitmap block and
|
|
|
|
* the free blocks count in the block. The descriptors are loaded in memory
|
2007-02-20 21:57:58 +00:00
|
|
|
* when a file system is mounted (see ext4_fill_super).
|
2006-10-11 08:20:50 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#define in_range(b, first, len) ((b) >= (first) && (b) <= (first) + (len) - 1)
|
|
|
|
|
|
|
|
/**
|
2006-10-11 08:20:53 +00:00
|
|
|
* ext4_get_group_desc() -- load group descriptor from disk
|
2006-10-11 08:20:50 +00:00
|
|
|
* @sb: super block
|
|
|
|
* @block_group: given block group
|
|
|
|
* @bh: pointer to the buffer head to store the block
|
|
|
|
* group descriptor
|
|
|
|
*/
|
2008-09-09 02:25:24 +00:00
|
|
|
struct ext4_group_desc * ext4_get_group_desc(struct super_block *sb,
|
2008-01-29 04:58:27 +00:00
|
|
|
ext4_group_t block_group,
|
2008-09-09 02:25:24 +00:00
|
|
|
struct buffer_head **bh)
|
2006-10-11 08:20:50 +00:00
|
|
|
{
|
|
|
|
unsigned long group_desc;
|
|
|
|
unsigned long offset;
|
2008-09-09 02:25:24 +00:00
|
|
|
struct ext4_group_desc *desc;
|
2006-10-11 08:20:53 +00:00
|
|
|
struct ext4_sb_info *sbi = EXT4_SB(sb);
|
2006-10-11 08:20:50 +00:00
|
|
|
|
|
|
|
if (block_group >= sbi->s_groups_count) {
|
2008-09-09 02:25:24 +00:00
|
|
|
ext4_error(sb, "ext4_get_group_desc",
|
|
|
|
"block_group >= groups_count - "
|
|
|
|
"block_group = %lu, groups_count = %lu",
|
|
|
|
block_group, sbi->s_groups_count);
|
2006-10-11 08:20:50 +00:00
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
smp_rmb();
|
|
|
|
|
2006-10-11 08:20:53 +00:00
|
|
|
group_desc = block_group >> EXT4_DESC_PER_BLOCK_BITS(sb);
|
|
|
|
offset = block_group & (EXT4_DESC_PER_BLOCK(sb) - 1);
|
2006-10-11 08:20:50 +00:00
|
|
|
if (!sbi->s_group_desc[group_desc]) {
|
2008-09-09 02:25:24 +00:00
|
|
|
ext4_error(sb, "ext4_get_group_desc",
|
|
|
|
"Group descriptor not loaded - "
|
|
|
|
"block_group = %lu, group_desc = %lu, desc = %lu",
|
|
|
|
block_group, group_desc, offset);
|
2006-10-11 08:20:50 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2006-10-11 08:21:14 +00:00
|
|
|
desc = (struct ext4_group_desc *)(
|
|
|
|
(__u8 *)sbi->s_group_desc[group_desc]->b_data +
|
|
|
|
offset * EXT4_DESC_SIZE(sb));
|
2006-10-11 08:20:50 +00:00
|
|
|
if (bh)
|
|
|
|
*bh = sbi->s_group_desc[group_desc];
|
2006-10-11 08:21:14 +00:00
|
|
|
return desc;
|
2006-10-11 08:20:50 +00:00
|
|
|
}
|
|
|
|
|
2008-01-29 04:58:27 +00:00
|
|
|
static int ext4_valid_block_bitmap(struct super_block *sb,
|
|
|
|
struct ext4_group_desc *desc,
|
|
|
|
unsigned int block_group,
|
|
|
|
struct buffer_head *bh)
|
|
|
|
{
|
|
|
|
ext4_grpblk_t offset;
|
|
|
|
ext4_grpblk_t next_zero_bit;
|
|
|
|
ext4_fsblk_t bitmap_blk;
|
|
|
|
ext4_fsblk_t group_first_block;
|
|
|
|
|
|
|
|
if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_FLEX_BG)) {
|
|
|
|
/* with FLEX_BG, the inode/block bitmaps and itable
|
|
|
|
* blocks may not be in the group at all
|
|
|
|
* so the bitmap validation will be skipped for those groups
|
|
|
|
* or it has to also read the block group where the bitmaps
|
|
|
|
* are located to verify they are set.
|
|
|
|
*/
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
group_first_block = ext4_group_first_block_no(sb, block_group);
|
|
|
|
|
|
|
|
/* check whether block bitmap block number is set */
|
|
|
|
bitmap_blk = ext4_block_bitmap(sb, desc);
|
|
|
|
offset = bitmap_blk - group_first_block;
|
|
|
|
if (!ext4_test_bit(offset, bh->b_data))
|
|
|
|
/* bad block bitmap */
|
|
|
|
goto err_out;
|
|
|
|
|
|
|
|
/* check whether the inode bitmap block number is set */
|
|
|
|
bitmap_blk = ext4_inode_bitmap(sb, desc);
|
|
|
|
offset = bitmap_blk - group_first_block;
|
|
|
|
if (!ext4_test_bit(offset, bh->b_data))
|
|
|
|
/* bad block bitmap */
|
|
|
|
goto err_out;
|
|
|
|
|
|
|
|
/* check whether the inode table block number is set */
|
|
|
|
bitmap_blk = ext4_inode_table(sb, desc);
|
|
|
|
offset = bitmap_blk - group_first_block;
|
|
|
|
next_zero_bit = ext4_find_next_zero_bit(bh->b_data,
|
|
|
|
offset + EXT4_SB(sb)->s_itb_per_group,
|
|
|
|
offset);
|
|
|
|
if (next_zero_bit >= offset + EXT4_SB(sb)->s_itb_per_group)
|
|
|
|
/* good bitmap for inode tables */
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
err_out:
|
2008-04-17 14:38:59 +00:00
|
|
|
ext4_error(sb, __func__,
|
2008-01-29 04:58:27 +00:00
|
|
|
"Invalid block bitmap - "
|
|
|
|
"block_group = %d, block = %llu",
|
|
|
|
block_group, bitmap_blk);
|
|
|
|
return 0;
|
|
|
|
}
|
2006-10-11 08:20:50 +00:00
|
|
|
/**
|
2008-07-11 23:27:31 +00:00
|
|
|
* ext4_read_block_bitmap()
|
2006-10-11 08:20:50 +00:00
|
|
|
* @sb: super block
|
|
|
|
* @block_group: given block group
|
|
|
|
*
|
2008-01-29 04:58:27 +00:00
|
|
|
* Read the bitmap for a given block_group,and validate the
|
|
|
|
* bits for block/inode/inode tables are set in the bitmaps
|
2006-10-11 08:20:50 +00:00
|
|
|
*
|
|
|
|
* Return buffer_head on success or NULL in case of failure.
|
|
|
|
*/
|
Ext4: Uninitialized Block Groups
In pass1 of e2fsck, every inode table in the fileystem is scanned and checked,
regardless of whether it is in use. This is this the most time consuming part
of the filesystem check. The unintialized block group feature can greatly
reduce e2fsck time by eliminating checking of uninitialized inodes.
With this feature, there is a a high water mark of used inodes for each block
group. Block and inode bitmaps can be uninitialized on disk via a flag in the
group descriptor to avoid reading or scanning them at e2fsck time. A checksum
of each group descriptor is used to ensure that corruption in the group
descriptor's bit flags does not cause incorrect operation.
The feature is enabled through a mkfs option
mke2fs /dev/ -O uninit_groups
A patch adding support for uninitialized block groups to e2fsprogs tools has
been posted to the linux-ext4 mailing list.
The patches have been stress tested with fsstress and fsx. In performance
tests testing e2fsck time, we have seen that e2fsck time on ext3 grows
linearly with the total number of inodes in the filesytem. In ext4 with the
uninitialized block groups feature, the e2fsck time is constant, based
solely on the number of used inodes rather than the total inode count.
Since typical ext4 filesystems only use 1-10% of their inodes, this feature can
greatly reduce e2fsck time for users. With performance improvement of 2-20
times, depending on how full the filesystem is.
The attached graph shows the major improvements in e2fsck times in filesystems
with a large total inode count, but few inodes in use.
In each group descriptor if we have
EXT4_BG_INODE_UNINIT set in bg_flags:
Inode table is not initialized/used in this group. So we can skip
the consistency check during fsck.
EXT4_BG_BLOCK_UNINIT set in bg_flags:
No block in the group is used. So we can skip the block bitmap
verification for this group.
We also add two new fields to group descriptor as a part of
uninitialized group patch.
__le16 bg_itable_unused; /* Unused inodes count */
__le16 bg_checksum; /* crc16(sb_uuid+group+desc) */
bg_itable_unused:
If we have EXT4_BG_INODE_UNINIT not set in bg_flags
then bg_itable_unused will give the offset within
the inode table till the inodes are used. This can be
used by fsck to skip list of inodes that are marked unused.
bg_checksum:
Now that we depend on bg_flags and bg_itable_unused to determine
the block and inode usage, we need to make sure group descriptor
is not corrupt. We add checksum to group descriptor to
detect corruption. If the descriptor is found to be corrupt, we
mark all the blocks and inodes in the group used.
Signed-off-by: Avantika Mathur <mathur@us.ibm.com>
Signed-off-by: Andreas Dilger <adilger@clusterfs.com>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
2007-10-16 22:38:25 +00:00
|
|
|
struct buffer_head *
|
2008-07-11 23:27:31 +00:00
|
|
|
ext4_read_block_bitmap(struct super_block *sb, ext4_group_t block_group)
|
2006-10-11 08:20:50 +00:00
|
|
|
{
|
2008-09-09 02:25:24 +00:00
|
|
|
struct ext4_group_desc *desc;
|
|
|
|
struct buffer_head *bh = NULL;
|
2007-10-17 06:27:02 +00:00
|
|
|
ext4_fsblk_t bitmap_blk;
|
2006-10-11 08:20:50 +00:00
|
|
|
|
Ext4: Uninitialized Block Groups
In pass1 of e2fsck, every inode table in the fileystem is scanned and checked,
regardless of whether it is in use. This is this the most time consuming part
of the filesystem check. The unintialized block group feature can greatly
reduce e2fsck time by eliminating checking of uninitialized inodes.
With this feature, there is a a high water mark of used inodes for each block
group. Block and inode bitmaps can be uninitialized on disk via a flag in the
group descriptor to avoid reading or scanning them at e2fsck time. A checksum
of each group descriptor is used to ensure that corruption in the group
descriptor's bit flags does not cause incorrect operation.
The feature is enabled through a mkfs option
mke2fs /dev/ -O uninit_groups
A patch adding support for uninitialized block groups to e2fsprogs tools has
been posted to the linux-ext4 mailing list.
The patches have been stress tested with fsstress and fsx. In performance
tests testing e2fsck time, we have seen that e2fsck time on ext3 grows
linearly with the total number of inodes in the filesytem. In ext4 with the
uninitialized block groups feature, the e2fsck time is constant, based
solely on the number of used inodes rather than the total inode count.
Since typical ext4 filesystems only use 1-10% of their inodes, this feature can
greatly reduce e2fsck time for users. With performance improvement of 2-20
times, depending on how full the filesystem is.
The attached graph shows the major improvements in e2fsck times in filesystems
with a large total inode count, but few inodes in use.
In each group descriptor if we have
EXT4_BG_INODE_UNINIT set in bg_flags:
Inode table is not initialized/used in this group. So we can skip
the consistency check during fsck.
EXT4_BG_BLOCK_UNINIT set in bg_flags:
No block in the group is used. So we can skip the block bitmap
verification for this group.
We also add two new fields to group descriptor as a part of
uninitialized group patch.
__le16 bg_itable_unused; /* Unused inodes count */
__le16 bg_checksum; /* crc16(sb_uuid+group+desc) */
bg_itable_unused:
If we have EXT4_BG_INODE_UNINIT not set in bg_flags
then bg_itable_unused will give the offset within
the inode table till the inodes are used. This can be
used by fsck to skip list of inodes that are marked unused.
bg_checksum:
Now that we depend on bg_flags and bg_itable_unused to determine
the block and inode usage, we need to make sure group descriptor
is not corrupt. We add checksum to group descriptor to
detect corruption. If the descriptor is found to be corrupt, we
mark all the blocks and inodes in the group used.
Signed-off-by: Avantika Mathur <mathur@us.ibm.com>
Signed-off-by: Andreas Dilger <adilger@clusterfs.com>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
2007-10-16 22:38:25 +00:00
|
|
|
desc = ext4_get_group_desc(sb, block_group, NULL);
|
2006-10-11 08:20:50 +00:00
|
|
|
if (!desc)
|
2007-10-17 06:27:02 +00:00
|
|
|
return NULL;
|
|
|
|
bitmap_blk = ext4_block_bitmap(sb, desc);
|
2008-01-29 04:58:27 +00:00
|
|
|
bh = sb_getblk(sb, bitmap_blk);
|
|
|
|
if (unlikely(!bh)) {
|
2008-04-17 14:38:59 +00:00
|
|
|
ext4_error(sb, __func__,
|
2008-01-29 04:58:27 +00:00
|
|
|
"Cannot read block bitmap - "
|
2008-08-03 01:21:02 +00:00
|
|
|
"block_group = %lu, block_bitmap = %llu",
|
|
|
|
block_group, bitmap_blk);
|
2008-01-29 04:58:27 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
ext4: fix initialization of UNINIT bitmap blocks
This fixes a bug which caused on-line resizing of filesystems with a
1k blocksize to fail. The root cause of this bug was the fact that if
an uninitalized bitmap block gets read in by userspace (which
e2fsprogs does try to avoid, but can happen when the blocksize is less
than the pagesize and an adjacent blocks is read into memory)
ext4_read_block_bitmap() was erroneously depending on the buffer
uptodate flag to decide whether it needed to initialize the bitmap
block in memory --- i.e., to set the standard set of blocks in use by
a block group (superblock, bitmaps, inode table, etc.). Essentially,
ext4_read_block_bitmap() assumed it was the only routine that might
try to read a block containing a block bitmap, which is simply not
true.
To fix this, ext4_read_block_bitmap() and ext4_read_inode_bitmap()
must always initialize uninitialized bitmap blocks. Once a block or
inode is allocated out of that bitmap, it will be marked as
initialized in the block group descriptor, so in general this won't
result any extra unnecessary work.
Signed-off-by: Frederic Bohe <frederic.bohe@bull.net>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-10-10 12:09:18 +00:00
|
|
|
if (buffer_uptodate(bh) &&
|
|
|
|
!(desc->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT)))
|
2008-01-29 04:58:27 +00:00
|
|
|
return bh;
|
|
|
|
|
ext4: fix initialization of UNINIT bitmap blocks
This fixes a bug which caused on-line resizing of filesystems with a
1k blocksize to fail. The root cause of this bug was the fact that if
an uninitalized bitmap block gets read in by userspace (which
e2fsprogs does try to avoid, but can happen when the blocksize is less
than the pagesize and an adjacent blocks is read into memory)
ext4_read_block_bitmap() was erroneously depending on the buffer
uptodate flag to decide whether it needed to initialize the bitmap
block in memory --- i.e., to set the standard set of blocks in use by
a block group (superblock, bitmaps, inode table, etc.). Essentially,
ext4_read_block_bitmap() assumed it was the only routine that might
try to read a block containing a block bitmap, which is simply not
true.
To fix this, ext4_read_block_bitmap() and ext4_read_inode_bitmap()
must always initialize uninitialized bitmap blocks. Once a block or
inode is allocated out of that bitmap, it will be marked as
initialized in the block group descriptor, so in general this won't
result any extra unnecessary work.
Signed-off-by: Frederic Bohe <frederic.bohe@bull.net>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2008-10-10 12:09:18 +00:00
|
|
|
lock_buffer(bh);
|
2008-08-03 01:21:08 +00:00
|
|
|
spin_lock(sb_bgl_lock(EXT4_SB(sb), block_group));
|
Ext4: Uninitialized Block Groups
In pass1 of e2fsck, every inode table in the fileystem is scanned and checked,
regardless of whether it is in use. This is this the most time consuming part
of the filesystem check. The unintialized block group feature can greatly
reduce e2fsck time by eliminating checking of uninitialized inodes.
With this feature, there is a a high water mark of used inodes for each block
group. Block and inode bitmaps can be uninitialized on disk via a flag in the
group descriptor to avoid reading or scanning them at e2fsck time. A checksum
of each group descriptor is used to ensure that corruption in the group
descriptor's bit flags does not cause incorrect operation.
The feature is enabled through a mkfs option
mke2fs /dev/ -O uninit_groups
A patch adding support for uninitialized block groups to e2fsprogs tools has
been posted to the linux-ext4 mailing list.
The patches have been stress tested with fsstress and fsx. In performance
tests testing e2fsck time, we have seen that e2fsck time on ext3 grows
linearly with the total number of inodes in the filesytem. In ext4 with the
uninitialized block groups feature, the e2fsck time is constant, based
solely on the number of used inodes rather than the total inode count.
Since typical ext4 filesystems only use 1-10% of their inodes, this feature can
greatly reduce e2fsck time for users. With performance improvement of 2-20
times, depending on how full the filesystem is.
The attached graph shows the major improvements in e2fsck times in filesystems
with a large total inode count, but few inodes in use.
In each group descriptor if we have
EXT4_BG_INODE_UNINIT set in bg_flags:
Inode table is not initialized/used in this group. So we can skip
the consistency check during fsck.
EXT4_BG_BLOCK_UNINIT set in bg_flags:
No block in the group is used. So we can skip the block bitmap
verification for this group.
We also add two new fields to group descriptor as a part of
uninitialized group patch.
__le16 bg_itable_unused; /* Unused inodes count */
__le16 bg_checksum; /* crc16(sb_uuid+group+desc) */
bg_itable_unused:
If we have EXT4_BG_INODE_UNINIT not set in bg_flags
then bg_itable_unused will give the offset within
the inode table till the inodes are used. This can be
used by fsck to skip list of inodes that are marked unused.
bg_checksum:
Now that we depend on bg_flags and bg_itable_unused to determine
the block and inode usage, we need to make sure group descriptor
is not corrupt. We add checksum to group descriptor to
detect corruption. If the descriptor is found to be corrupt, we
mark all the blocks and inodes in the group used.
Signed-off-by: Avantika Mathur <mathur@us.ibm.com>
Signed-off-by: Andreas Dilger <adilger@clusterfs.com>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
2007-10-16 22:38:25 +00:00
|
|
|
if (desc->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT)) {
|
2008-01-29 04:58:27 +00:00
|
|
|
ext4_init_block_bitmap(sb, bh, block_group, desc);
|
|
|
|
set_buffer_uptodate(bh);
|
|
|
|
unlock_buffer(bh);
|
2008-08-03 01:21:08 +00:00
|
|
|
spin_unlock(sb_bgl_lock(EXT4_SB(sb), block_group));
|
2008-01-29 04:58:27 +00:00
|
|
|
return bh;
|
Ext4: Uninitialized Block Groups
In pass1 of e2fsck, every inode table in the fileystem is scanned and checked,
regardless of whether it is in use. This is this the most time consuming part
of the filesystem check. The unintialized block group feature can greatly
reduce e2fsck time by eliminating checking of uninitialized inodes.
With this feature, there is a a high water mark of used inodes for each block
group. Block and inode bitmaps can be uninitialized on disk via a flag in the
group descriptor to avoid reading or scanning them at e2fsck time. A checksum
of each group descriptor is used to ensure that corruption in the group
descriptor's bit flags does not cause incorrect operation.
The feature is enabled through a mkfs option
mke2fs /dev/ -O uninit_groups
A patch adding support for uninitialized block groups to e2fsprogs tools has
been posted to the linux-ext4 mailing list.
The patches have been stress tested with fsstress and fsx. In performance
tests testing e2fsck time, we have seen that e2fsck time on ext3 grows
linearly with the total number of inodes in the filesytem. In ext4 with the
uninitialized block groups feature, the e2fsck time is constant, based
solely on the number of used inodes rather than the total inode count.
Since typical ext4 filesystems only use 1-10% of their inodes, this feature can
greatly reduce e2fsck time for users. With performance improvement of 2-20
times, depending on how full the filesystem is.
The attached graph shows the major improvements in e2fsck times in filesystems
with a large total inode count, but few inodes in use.
In each group descriptor if we have
EXT4_BG_INODE_UNINIT set in bg_flags:
Inode table is not initialized/used in this group. So we can skip
the consistency check during fsck.
EXT4_BG_BLOCK_UNINIT set in bg_flags:
No block in the group is used. So we can skip the block bitmap
verification for this group.
We also add two new fields to group descriptor as a part of
uninitialized group patch.
__le16 bg_itable_unused; /* Unused inodes count */
__le16 bg_checksum; /* crc16(sb_uuid+group+desc) */
bg_itable_unused:
If we have EXT4_BG_INODE_UNINIT not set in bg_flags
then bg_itable_unused will give the offset within
the inode table till the inodes are used. This can be
used by fsck to skip list of inodes that are marked unused.
bg_checksum:
Now that we depend on bg_flags and bg_itable_unused to determine
the block and inode usage, we need to make sure group descriptor
is not corrupt. We add checksum to group descriptor to
detect corruption. If the descriptor is found to be corrupt, we
mark all the blocks and inodes in the group used.
Signed-off-by: Avantika Mathur <mathur@us.ibm.com>
Signed-off-by: Andreas Dilger <adilger@clusterfs.com>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
2007-10-16 22:38:25 +00:00
|
|
|
}
|
2008-08-03 01:21:08 +00:00
|
|
|
spin_unlock(sb_bgl_lock(EXT4_SB(sb), block_group));
|
2008-01-29 04:58:27 +00:00
|
|
|
if (bh_submit_read(bh) < 0) {
|
|
|
|
put_bh(bh);
|
2008-04-17 14:38:59 +00:00
|
|
|
ext4_error(sb, __func__,
|
2006-10-11 08:20:50 +00:00
|
|
|
"Cannot read block bitmap - "
|
2008-08-03 01:21:02 +00:00
|
|
|
"block_group = %lu, block_bitmap = %llu",
|
|
|
|
block_group, bitmap_blk);
|
2008-01-29 04:58:27 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
2008-05-15 18:43:20 +00:00
|
|
|
ext4_valid_block_bitmap(sb, desc, block_group, bh);
|
|
|
|
/*
|
|
|
|
* file system mounted not to panic on error,
|
|
|
|
* continue with corrupt bitmap
|
|
|
|
*/
|
2006-10-11 08:20:50 +00:00
|
|
|
return bh;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2006-10-11 08:20:53 +00:00
|
|
|
* ext4_free_blocks_sb() -- Free given blocks and update quota
|
2006-10-11 08:20:50 +00:00
|
|
|
* @handle: handle to this transaction
|
|
|
|
* @sb: super block
|
|
|
|
* @block: start physcial block to free
|
|
|
|
* @count: number of blocks to free
|
|
|
|
* @pdquot_freed_blocks: pointer to quota
|
2008-10-10 13:40:52 +00:00
|
|
|
*
|
|
|
|
* XXX This function is only used by the on-line resizing code, which
|
|
|
|
* should probably be fixed up to call the mballoc variant. There
|
|
|
|
* this needs to be cleaned up later; in fact, I'm not convinced this
|
|
|
|
* is 100% correct in the face of the mballoc code. The online resizing
|
|
|
|
* code needs to be fixed up to more tightly (and correctly) interlock
|
|
|
|
* with the mballoc code.
|
2006-10-11 08:20:50 +00:00
|
|
|
*/
|
2006-10-11 08:20:53 +00:00
|
|
|
void ext4_free_blocks_sb(handle_t *handle, struct super_block *sb,
|
|
|
|
ext4_fsblk_t block, unsigned long count,
|
2006-10-11 08:20:50 +00:00
|
|
|
unsigned long *pdquot_freed_blocks)
|
|
|
|
{
|
|
|
|
struct buffer_head *bitmap_bh = NULL;
|
|
|
|
struct buffer_head *gd_bh;
|
2008-01-29 04:58:27 +00:00
|
|
|
ext4_group_t block_group;
|
2006-10-11 08:20:53 +00:00
|
|
|
ext4_grpblk_t bit;
|
2006-10-11 08:20:50 +00:00
|
|
|
unsigned long i;
|
|
|
|
unsigned long overflow;
|
2008-09-09 02:25:24 +00:00
|
|
|
struct ext4_group_desc *desc;
|
|
|
|
struct ext4_super_block *es;
|
2006-10-11 08:20:53 +00:00
|
|
|
struct ext4_sb_info *sbi;
|
2006-10-11 08:20:50 +00:00
|
|
|
int err = 0, ret;
|
2006-10-11 08:20:53 +00:00
|
|
|
ext4_grpblk_t group_freed;
|
2006-10-11 08:20:50 +00:00
|
|
|
|
|
|
|
*pdquot_freed_blocks = 0;
|
2006-10-11 08:20:53 +00:00
|
|
|
sbi = EXT4_SB(sb);
|
2006-10-11 08:20:50 +00:00
|
|
|
es = sbi->s_es;
|
|
|
|
if (block < le32_to_cpu(es->s_first_data_block) ||
|
|
|
|
block + count < block ||
|
2006-10-11 08:21:10 +00:00
|
|
|
block + count > ext4_blocks_count(es)) {
|
2008-09-09 02:25:24 +00:00
|
|
|
ext4_error(sb, "ext4_free_blocks",
|
|
|
|
"Freeing blocks not in datazone - "
|
|
|
|
"block = %llu, count = %lu", block, count);
|
2006-10-11 08:20:50 +00:00
|
|
|
goto error_return;
|
|
|
|
}
|
|
|
|
|
2008-09-09 02:25:24 +00:00
|
|
|
ext4_debug("freeing block(s) %llu-%llu\n", block, block + count - 1);
|
2006-10-11 08:20:50 +00:00
|
|
|
|
|
|
|
do_more:
|
|
|
|
overflow = 0;
|
2006-10-11 08:21:05 +00:00
|
|
|
ext4_get_group_no_and_offset(sb, block, &block_group, &bit);
|
2006-10-11 08:20:50 +00:00
|
|
|
/*
|
|
|
|
* Check to see if we are freeing blocks across a group
|
|
|
|
* boundary.
|
|
|
|
*/
|
2006-10-11 08:20:53 +00:00
|
|
|
if (bit + count > EXT4_BLOCKS_PER_GROUP(sb)) {
|
|
|
|
overflow = bit + count - EXT4_BLOCKS_PER_GROUP(sb);
|
2006-10-11 08:20:50 +00:00
|
|
|
count -= overflow;
|
|
|
|
}
|
|
|
|
brelse(bitmap_bh);
|
2008-07-11 23:27:31 +00:00
|
|
|
bitmap_bh = ext4_read_block_bitmap(sb, block_group);
|
2006-10-11 08:20:50 +00:00
|
|
|
if (!bitmap_bh)
|
|
|
|
goto error_return;
|
2008-09-09 02:25:24 +00:00
|
|
|
desc = ext4_get_group_desc(sb, block_group, &gd_bh);
|
2006-10-11 08:20:50 +00:00
|
|
|
if (!desc)
|
|
|
|
goto error_return;
|
|
|
|
|
2006-10-11 08:21:15 +00:00
|
|
|
if (in_range(ext4_block_bitmap(sb, desc), block, count) ||
|
|
|
|
in_range(ext4_inode_bitmap(sb, desc), block, count) ||
|
|
|
|
in_range(block, ext4_inode_table(sb, desc), sbi->s_itb_per_group) ||
|
|
|
|
in_range(block + count - 1, ext4_inode_table(sb, desc),
|
2008-01-29 04:58:27 +00:00
|
|
|
sbi->s_itb_per_group)) {
|
2008-09-09 02:25:24 +00:00
|
|
|
ext4_error(sb, "ext4_free_blocks",
|
|
|
|
"Freeing blocks in system zones - "
|
|
|
|
"Block = %llu, count = %lu",
|
|
|
|
block, count);
|
2008-01-29 04:58:27 +00:00
|
|
|
goto error_return;
|
|
|
|
}
|
2006-10-11 08:20:50 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* We are about to start releasing blocks in the bitmap,
|
|
|
|
* so we need undo access.
|
|
|
|
*/
|
|
|
|
/* @@@ check errors */
|
|
|
|
BUFFER_TRACE(bitmap_bh, "getting undo access");
|
2006-10-11 08:20:53 +00:00
|
|
|
err = ext4_journal_get_undo_access(handle, bitmap_bh);
|
2006-10-11 08:20:50 +00:00
|
|
|
if (err)
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We are about to modify some metadata. Call the journal APIs
|
|
|
|
* to unshare ->b_data if a currently-committing transaction is
|
|
|
|
* using it
|
|
|
|
*/
|
|
|
|
BUFFER_TRACE(gd_bh, "get_write_access");
|
2006-10-11 08:20:53 +00:00
|
|
|
err = ext4_journal_get_write_access(handle, gd_bh);
|
2006-10-11 08:20:50 +00:00
|
|
|
if (err)
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
jbd_lock_bh_state(bitmap_bh);
|
|
|
|
|
|
|
|
for (i = 0, group_freed = 0; i < count; i++) {
|
|
|
|
/*
|
|
|
|
* An HJ special. This is expensive...
|
|
|
|
*/
|
2007-07-18 12:57:06 +00:00
|
|
|
#ifdef CONFIG_JBD2_DEBUG
|
2006-10-11 08:20:50 +00:00
|
|
|
jbd_unlock_bh_state(bitmap_bh);
|
|
|
|
{
|
|
|
|
struct buffer_head *debug_bh;
|
|
|
|
debug_bh = sb_find_get_block(sb, block + i);
|
|
|
|
if (debug_bh) {
|
|
|
|
BUFFER_TRACE(debug_bh, "Deleted!");
|
|
|
|
if (!bh2jh(bitmap_bh)->b_committed_data)
|
|
|
|
BUFFER_TRACE(debug_bh,
|
|
|
|
"No commited data in bitmap");
|
|
|
|
BUFFER_TRACE2(debug_bh, bitmap_bh, "bitmap");
|
|
|
|
__brelse(debug_bh);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
jbd_lock_bh_state(bitmap_bh);
|
|
|
|
#endif
|
|
|
|
if (need_resched()) {
|
|
|
|
jbd_unlock_bh_state(bitmap_bh);
|
|
|
|
cond_resched();
|
|
|
|
jbd_lock_bh_state(bitmap_bh);
|
|
|
|
}
|
|
|
|
/* @@@ This prevents newly-allocated data from being
|
|
|
|
* freed and then reallocated within the same
|
|
|
|
* transaction.
|
|
|
|
*
|
|
|
|
* Ideally we would want to allow that to happen, but to
|
2006-10-11 08:21:01 +00:00
|
|
|
* do so requires making jbd2_journal_forget() capable of
|
2006-10-11 08:20:50 +00:00
|
|
|
* revoking the queued write of a data block, which
|
|
|
|
* implies blocking on the journal lock. *forget()
|
|
|
|
* cannot block due to truncate races.
|
|
|
|
*
|
2006-10-11 08:21:01 +00:00
|
|
|
* Eventually we can fix this by making jbd2_journal_forget()
|
2006-10-11 08:20:50 +00:00
|
|
|
* return a status indicating whether or not it was able
|
|
|
|
* to revoke the buffer. On successful revoke, it is
|
|
|
|
* safe not to set the allocation bit in the committed
|
|
|
|
* bitmap, because we know that there is no outstanding
|
|
|
|
* activity on the buffer any more and so it is safe to
|
|
|
|
* reallocate it.
|
|
|
|
*/
|
|
|
|
BUFFER_TRACE(bitmap_bh, "set in b_committed_data");
|
|
|
|
J_ASSERT_BH(bitmap_bh,
|
|
|
|
bh2jh(bitmap_bh)->b_committed_data != NULL);
|
2006-10-11 08:20:53 +00:00
|
|
|
ext4_set_bit_atomic(sb_bgl_lock(sbi, block_group), bit + i,
|
2006-10-11 08:20:50 +00:00
|
|
|
bh2jh(bitmap_bh)->b_committed_data);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We clear the bit in the bitmap after setting the committed
|
|
|
|
* data bit, because this is the reverse order to that which
|
|
|
|
* the allocator uses.
|
|
|
|
*/
|
|
|
|
BUFFER_TRACE(bitmap_bh, "clear bit");
|
2006-10-11 08:20:53 +00:00
|
|
|
if (!ext4_clear_bit_atomic(sb_bgl_lock(sbi, block_group),
|
2006-10-11 08:20:50 +00:00
|
|
|
bit + i, bitmap_bh->b_data)) {
|
|
|
|
jbd_unlock_bh_state(bitmap_bh);
|
2008-04-17 14:38:59 +00:00
|
|
|
ext4_error(sb, __func__,
|
2006-10-11 08:21:11 +00:00
|
|
|
"bit already cleared for block %llu",
|
2006-10-11 08:21:10 +00:00
|
|
|
(ext4_fsblk_t)(block + i));
|
2006-10-11 08:20:50 +00:00
|
|
|
jbd_lock_bh_state(bitmap_bh);
|
|
|
|
BUFFER_TRACE(bitmap_bh, "bit already cleared");
|
|
|
|
} else {
|
|
|
|
group_freed++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
jbd_unlock_bh_state(bitmap_bh);
|
|
|
|
|
|
|
|
spin_lock(sb_bgl_lock(sbi, block_group));
|
2008-04-17 14:38:59 +00:00
|
|
|
le16_add_cpu(&desc->bg_free_blocks_count, group_freed);
|
Ext4: Uninitialized Block Groups
In pass1 of e2fsck, every inode table in the fileystem is scanned and checked,
regardless of whether it is in use. This is this the most time consuming part
of the filesystem check. The unintialized block group feature can greatly
reduce e2fsck time by eliminating checking of uninitialized inodes.
With this feature, there is a a high water mark of used inodes for each block
group. Block and inode bitmaps can be uninitialized on disk via a flag in the
group descriptor to avoid reading or scanning them at e2fsck time. A checksum
of each group descriptor is used to ensure that corruption in the group
descriptor's bit flags does not cause incorrect operation.
The feature is enabled through a mkfs option
mke2fs /dev/ -O uninit_groups
A patch adding support for uninitialized block groups to e2fsprogs tools has
been posted to the linux-ext4 mailing list.
The patches have been stress tested with fsstress and fsx. In performance
tests testing e2fsck time, we have seen that e2fsck time on ext3 grows
linearly with the total number of inodes in the filesytem. In ext4 with the
uninitialized block groups feature, the e2fsck time is constant, based
solely on the number of used inodes rather than the total inode count.
Since typical ext4 filesystems only use 1-10% of their inodes, this feature can
greatly reduce e2fsck time for users. With performance improvement of 2-20
times, depending on how full the filesystem is.
The attached graph shows the major improvements in e2fsck times in filesystems
with a large total inode count, but few inodes in use.
In each group descriptor if we have
EXT4_BG_INODE_UNINIT set in bg_flags:
Inode table is not initialized/used in this group. So we can skip
the consistency check during fsck.
EXT4_BG_BLOCK_UNINIT set in bg_flags:
No block in the group is used. So we can skip the block bitmap
verification for this group.
We also add two new fields to group descriptor as a part of
uninitialized group patch.
__le16 bg_itable_unused; /* Unused inodes count */
__le16 bg_checksum; /* crc16(sb_uuid+group+desc) */
bg_itable_unused:
If we have EXT4_BG_INODE_UNINIT not set in bg_flags
then bg_itable_unused will give the offset within
the inode table till the inodes are used. This can be
used by fsck to skip list of inodes that are marked unused.
bg_checksum:
Now that we depend on bg_flags and bg_itable_unused to determine
the block and inode usage, we need to make sure group descriptor
is not corrupt. We add checksum to group descriptor to
detect corruption. If the descriptor is found to be corrupt, we
mark all the blocks and inodes in the group used.
Signed-off-by: Avantika Mathur <mathur@us.ibm.com>
Signed-off-by: Andreas Dilger <adilger@clusterfs.com>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
2007-10-16 22:38:25 +00:00
|
|
|
desc->bg_checksum = ext4_group_desc_csum(sbi, block_group, desc);
|
2006-10-11 08:20:50 +00:00
|
|
|
spin_unlock(sb_bgl_lock(sbi, block_group));
|
2007-10-17 06:25:42 +00:00
|
|
|
percpu_counter_add(&sbi->s_freeblocks_counter, count);
|
2006-10-11 08:20:50 +00:00
|
|
|
|
2008-07-11 23:27:31 +00:00
|
|
|
if (sbi->s_log_groups_per_flex) {
|
|
|
|
ext4_group_t flex_group = ext4_flex_group(sbi, block_group);
|
|
|
|
spin_lock(sb_bgl_lock(sbi, flex_group));
|
|
|
|
sbi->s_flex_groups[flex_group].free_blocks += count;
|
|
|
|
spin_unlock(sb_bgl_lock(sbi, flex_group));
|
|
|
|
}
|
|
|
|
|
2006-10-11 08:20:50 +00:00
|
|
|
/* We dirtied the bitmap block */
|
|
|
|
BUFFER_TRACE(bitmap_bh, "dirtied bitmap block");
|
2006-10-11 08:20:53 +00:00
|
|
|
err = ext4_journal_dirty_metadata(handle, bitmap_bh);
|
2006-10-11 08:20:50 +00:00
|
|
|
|
|
|
|
/* And the group descriptor block */
|
|
|
|
BUFFER_TRACE(gd_bh, "dirtied group descriptor block");
|
2006-10-11 08:20:53 +00:00
|
|
|
ret = ext4_journal_dirty_metadata(handle, gd_bh);
|
2006-10-11 08:20:50 +00:00
|
|
|
if (!err) err = ret;
|
|
|
|
*pdquot_freed_blocks += group_freed;
|
|
|
|
|
|
|
|
if (overflow && !err) {
|
|
|
|
block += count;
|
|
|
|
count = overflow;
|
|
|
|
goto do_more;
|
|
|
|
}
|
|
|
|
sb->s_dirt = 1;
|
|
|
|
error_return:
|
|
|
|
brelse(bitmap_bh);
|
2006-10-11 08:20:53 +00:00
|
|
|
ext4_std_error(sb, err);
|
2006-10-11 08:20:50 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2006-10-11 08:20:53 +00:00
|
|
|
* ext4_free_blocks() -- Free given blocks and update quota
|
2006-10-11 08:20:50 +00:00
|
|
|
* @handle: handle for this transaction
|
|
|
|
* @inode: inode
|
|
|
|
* @block: start physical block to free
|
|
|
|
* @count: number of blocks to count
|
2008-01-29 05:19:52 +00:00
|
|
|
* @metadata: Are these metadata blocks
|
2006-10-11 08:20:50 +00:00
|
|
|
*/
|
2006-10-11 08:20:53 +00:00
|
|
|
void ext4_free_blocks(handle_t *handle, struct inode *inode,
|
2008-01-29 05:19:52 +00:00
|
|
|
ext4_fsblk_t block, unsigned long count,
|
|
|
|
int metadata)
|
2006-10-11 08:20:50 +00:00
|
|
|
{
|
2008-09-09 02:25:24 +00:00
|
|
|
struct super_block *sb;
|
2006-10-11 08:20:50 +00:00
|
|
|
unsigned long dquot_freed_blocks;
|
|
|
|
|
2008-01-29 05:19:52 +00:00
|
|
|
/* this isn't the right place to decide whether block is metadata
|
|
|
|
* inode.c/extents.c knows better, but for safety ... */
|
2008-10-11 00:13:31 +00:00
|
|
|
if (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode))
|
|
|
|
metadata = 1;
|
|
|
|
|
|
|
|
/* We need to make sure we don't reuse
|
|
|
|
* block released untill the transaction commit.
|
|
|
|
* writeback mode have weak data consistency so
|
|
|
|
* don't force data as metadata when freeing block
|
|
|
|
* for writeback mode.
|
|
|
|
*/
|
|
|
|
if (metadata == 0 && !ext4_should_writeback_data(inode))
|
2008-01-29 05:19:52 +00:00
|
|
|
metadata = 1;
|
|
|
|
|
2006-10-11 08:20:50 +00:00
|
|
|
sb = inode->i_sb;
|
2008-01-29 05:19:52 +00:00
|
|
|
|
2008-10-10 13:40:52 +00:00
|
|
|
ext4_mb_free_blocks(handle, inode, block, count,
|
|
|
|
metadata, &dquot_freed_blocks);
|
2006-10-11 08:20:50 +00:00
|
|
|
if (dquot_freed_blocks)
|
|
|
|
DQUOT_FREE_BLOCK(inode, dquot_freed_blocks);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2008-10-28 04:08:12 +00:00
|
|
|
/**
|
|
|
|
* ext4_has_free_blocks()
|
|
|
|
* @sbi: in-core super block structure.
|
|
|
|
* @nblocks: number of needed blocks
|
|
|
|
*
|
|
|
|
* Check if filesystem has nblocks free & available for allocation.
|
|
|
|
* On success return 1, return 0 on failure.
|
|
|
|
*/
|
|
|
|
int ext4_has_free_blocks(struct ext4_sb_info *sbi, s64 nblocks)
|
2008-10-09 14:56:23 +00:00
|
|
|
{
|
2008-10-28 04:08:17 +00:00
|
|
|
s64 free_blocks, dirty_blocks, root_blocks;
|
2008-10-09 14:56:23 +00:00
|
|
|
struct percpu_counter *fbc = &sbi->s_freeblocks_counter;
|
2008-10-10 13:39:00 +00:00
|
|
|
struct percpu_counter *dbc = &sbi->s_dirtyblocks_counter;
|
2008-10-09 14:56:23 +00:00
|
|
|
|
2008-10-10 13:39:00 +00:00
|
|
|
free_blocks = percpu_counter_read_positive(fbc);
|
|
|
|
dirty_blocks = percpu_counter_read_positive(dbc);
|
2008-10-28 04:08:17 +00:00
|
|
|
root_blocks = ext4_r_blocks_count(sbi->s_es);
|
2008-10-09 14:56:23 +00:00
|
|
|
|
2008-10-10 13:39:00 +00:00
|
|
|
if (free_blocks - (nblocks + root_blocks + dirty_blocks) <
|
|
|
|
EXT4_FREEBLOCKS_WATERMARK) {
|
|
|
|
free_blocks = percpu_counter_sum(fbc);
|
|
|
|
dirty_blocks = percpu_counter_sum(dbc);
|
|
|
|
if (dirty_blocks < 0) {
|
|
|
|
printk(KERN_CRIT "Dirty block accounting "
|
|
|
|
"went wrong %lld\n",
|
|
|
|
dirty_blocks);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* Check whether we have space after
|
2008-10-28 04:08:17 +00:00
|
|
|
* accounting for current dirty blocks & root reserved blocks.
|
2008-10-10 13:39:00 +00:00
|
|
|
*/
|
2008-10-28 04:08:17 +00:00
|
|
|
if (free_blocks >= ((root_blocks + nblocks) + dirty_blocks))
|
|
|
|
return 1;
|
2008-10-09 14:56:23 +00:00
|
|
|
|
2008-10-28 04:08:17 +00:00
|
|
|
/* Hm, nope. Are (enough) root reserved blocks available? */
|
|
|
|
if (sbi->s_resuid == current->fsuid ||
|
|
|
|
((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) ||
|
|
|
|
capable(CAP_SYS_RESOURCE)) {
|
|
|
|
if (free_blocks >= (nblocks + dirty_blocks))
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
2008-10-09 14:56:23 +00:00
|
|
|
}
|
|
|
|
|
2008-10-28 04:08:12 +00:00
|
|
|
int ext4_claim_free_blocks(struct ext4_sb_info *sbi,
|
2008-10-09 03:12:24 +00:00
|
|
|
s64 nblocks)
|
2006-10-11 08:20:50 +00:00
|
|
|
{
|
2008-10-28 04:08:12 +00:00
|
|
|
if (ext4_has_free_blocks(sbi, nblocks)) {
|
|
|
|
percpu_counter_add(&sbi->s_dirtyblocks_counter, nblocks);
|
2008-08-20 01:16:54 +00:00
|
|
|
return 0;
|
2008-10-28 04:08:12 +00:00
|
|
|
} else
|
|
|
|
return -ENOSPC;
|
2008-10-09 14:56:23 +00:00
|
|
|
}
|
2008-07-11 23:27:31 +00:00
|
|
|
|
2006-10-11 08:20:50 +00:00
|
|
|
/**
|
2006-10-11 08:20:53 +00:00
|
|
|
* ext4_should_retry_alloc()
|
2006-10-11 08:20:50 +00:00
|
|
|
* @sb: super block
|
|
|
|
* @retries number of attemps has been made
|
|
|
|
*
|
2006-10-11 08:20:53 +00:00
|
|
|
* ext4_should_retry_alloc() is called when ENOSPC is returned, and if
|
2006-10-11 08:20:50 +00:00
|
|
|
* it is profitable to retry the operation, this function will wait
|
|
|
|
* for the current or commiting transaction to complete, and then
|
|
|
|
* return TRUE.
|
|
|
|
*
|
|
|
|
* if the total number of retries exceed three times, return FALSE.
|
|
|
|
*/
|
2006-10-11 08:20:53 +00:00
|
|
|
int ext4_should_retry_alloc(struct super_block *sb, int *retries)
|
2006-10-11 08:20:50 +00:00
|
|
|
{
|
2008-07-11 23:27:31 +00:00
|
|
|
if (!ext4_has_free_blocks(EXT4_SB(sb), 1) || (*retries)++ > 3)
|
2006-10-11 08:20:50 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
jbd_debug(1, "%s: retrying operation after ENOSPC\n", sb->s_id);
|
|
|
|
|
2006-10-11 08:21:01 +00:00
|
|
|
return jbd2_journal_force_commit_nested(EXT4_SB(sb)->s_journal);
|
2006-10-11 08:20:50 +00:00
|
|
|
}
|
|
|
|
|
2008-07-11 23:27:31 +00:00
|
|
|
#define EXT4_META_BLOCK 0x1
|
2008-01-29 05:19:52 +00:00
|
|
|
|
2008-07-11 23:27:31 +00:00
|
|
|
static ext4_fsblk_t do_blk_alloc(handle_t *handle, struct inode *inode,
|
2008-07-11 23:27:31 +00:00
|
|
|
ext4_lblk_t iblock, ext4_fsblk_t goal,
|
2008-07-11 23:27:31 +00:00
|
|
|
unsigned long *count, int *errp, int flags)
|
2006-10-11 08:20:50 +00:00
|
|
|
{
|
2008-01-29 05:19:52 +00:00
|
|
|
struct ext4_allocation_request ar;
|
|
|
|
ext4_fsblk_t ret;
|
2006-10-11 08:20:50 +00:00
|
|
|
|
2008-01-29 05:19:52 +00:00
|
|
|
memset(&ar, 0, sizeof(ar));
|
2008-07-11 23:27:31 +00:00
|
|
|
/* Fill with neighbour allocated blocks */
|
|
|
|
|
2008-01-29 05:19:52 +00:00
|
|
|
ar.inode = inode;
|
|
|
|
ar.goal = goal;
|
|
|
|
ar.len = *count;
|
2008-07-11 23:27:31 +00:00
|
|
|
ar.logical = iblock;
|
2008-07-11 23:27:31 +00:00
|
|
|
|
|
|
|
if (S_ISREG(inode->i_mode) && !(flags & EXT4_META_BLOCK))
|
|
|
|
/* enable in-core preallocation for data block allocation */
|
2008-07-11 23:27:31 +00:00
|
|
|
ar.flags = EXT4_MB_HINT_DATA;
|
|
|
|
else
|
|
|
|
/* disable in-core preallocation for non-regular files */
|
|
|
|
ar.flags = 0;
|
2008-07-11 23:27:31 +00:00
|
|
|
|
2008-01-29 05:19:52 +00:00
|
|
|
ret = ext4_mb_new_blocks(handle, &ar, errp);
|
|
|
|
*count = ar.len;
|
|
|
|
return ret;
|
2006-10-11 08:20:50 +00:00
|
|
|
}
|
|
|
|
|
2008-07-11 23:27:31 +00:00
|
|
|
/*
|
2008-07-14 21:52:37 +00:00
|
|
|
* ext4_new_meta_blocks() -- allocate block for meta data (indexing) blocks
|
2008-07-11 23:27:31 +00:00
|
|
|
*
|
|
|
|
* @handle: handle to this transaction
|
|
|
|
* @inode: file inode
|
|
|
|
* @goal: given target block(filesystem wide)
|
2008-07-14 21:52:37 +00:00
|
|
|
* @count: total number of blocks need
|
2008-07-11 23:27:31 +00:00
|
|
|
* @errp: error code
|
|
|
|
*
|
2008-07-14 21:52:37 +00:00
|
|
|
* Return 1st allocated block numberon success, *count stores total account
|
|
|
|
* error stores in errp pointer
|
2008-07-11 23:27:31 +00:00
|
|
|
*/
|
2008-07-14 21:52:37 +00:00
|
|
|
ext4_fsblk_t ext4_new_meta_blocks(handle_t *handle, struct inode *inode,
|
|
|
|
ext4_fsblk_t goal, unsigned long *count, int *errp)
|
2008-07-11 23:27:31 +00:00
|
|
|
{
|
2008-07-14 21:52:37 +00:00
|
|
|
ext4_fsblk_t ret;
|
|
|
|
ret = do_blk_alloc(handle, inode, 0, goal,
|
|
|
|
count, errp, EXT4_META_BLOCK);
|
|
|
|
/*
|
|
|
|
* Account for the allocated meta blocks
|
|
|
|
*/
|
2008-09-09 03:08:40 +00:00
|
|
|
if (!(*errp) && EXT4_I(inode)->i_delalloc_reserved_flag) {
|
2008-07-14 21:52:37 +00:00
|
|
|
spin_lock(&EXT4_I(inode)->i_block_reservation_lock);
|
|
|
|
EXT4_I(inode)->i_allocated_meta_blocks += *count;
|
|
|
|
spin_unlock(&EXT4_I(inode)->i_block_reservation_lock);
|
|
|
|
}
|
|
|
|
return ret;
|
2008-07-11 23:27:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2008-07-14 21:52:37 +00:00
|
|
|
* ext4_new_meta_block() -- allocate block for meta data (indexing) blocks
|
2008-07-11 23:27:31 +00:00
|
|
|
*
|
|
|
|
* @handle: handle to this transaction
|
|
|
|
* @inode: file inode
|
|
|
|
* @goal: given target block(filesystem wide)
|
|
|
|
* @errp: error code
|
|
|
|
*
|
2008-07-14 21:52:37 +00:00
|
|
|
* Return allocated block number on success
|
2008-07-11 23:27:31 +00:00
|
|
|
*/
|
2008-07-14 21:52:37 +00:00
|
|
|
ext4_fsblk_t ext4_new_meta_block(handle_t *handle, struct inode *inode,
|
|
|
|
ext4_fsblk_t goal, int *errp)
|
2008-07-11 23:27:31 +00:00
|
|
|
{
|
2008-07-14 21:52:37 +00:00
|
|
|
unsigned long count = 1;
|
|
|
|
return ext4_new_meta_blocks(handle, inode, goal, &count, errp);
|
2008-07-11 23:27:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ext4_new_blocks() -- allocate data blocks
|
|
|
|
*
|
|
|
|
* @handle: handle to this transaction
|
|
|
|
* @inode: file inode
|
|
|
|
* @goal: given target block(filesystem wide)
|
|
|
|
* @count: total number of blocks need
|
|
|
|
* @errp: error code
|
|
|
|
*
|
|
|
|
* Return 1st allocated block numberon success, *count stores total account
|
|
|
|
* error stores in errp pointer
|
|
|
|
*/
|
|
|
|
|
|
|
|
ext4_fsblk_t ext4_new_blocks(handle_t *handle, struct inode *inode,
|
|
|
|
ext4_lblk_t iblock, ext4_fsblk_t goal,
|
|
|
|
unsigned long *count, int *errp)
|
|
|
|
{
|
|
|
|
return do_blk_alloc(handle, inode, iblock, goal, count, errp, 0);
|
|
|
|
}
|
2008-01-29 05:19:52 +00:00
|
|
|
|
2006-10-11 08:20:50 +00:00
|
|
|
/**
|
2006-10-11 08:20:53 +00:00
|
|
|
* ext4_count_free_blocks() -- count filesystem free blocks
|
2006-10-11 08:20:50 +00:00
|
|
|
* @sb: superblock
|
|
|
|
*
|
|
|
|
* Adds up the number of free blocks from each block group.
|
|
|
|
*/
|
2006-10-11 08:20:53 +00:00
|
|
|
ext4_fsblk_t ext4_count_free_blocks(struct super_block *sb)
|
2006-10-11 08:20:50 +00:00
|
|
|
{
|
2006-10-11 08:20:53 +00:00
|
|
|
ext4_fsblk_t desc_count;
|
|
|
|
struct ext4_group_desc *gdp;
|
2008-01-29 04:58:27 +00:00
|
|
|
ext4_group_t i;
|
|
|
|
ext4_group_t ngroups = EXT4_SB(sb)->s_groups_count;
|
2006-10-11 08:20:53 +00:00
|
|
|
#ifdef EXT4FS_DEBUG
|
|
|
|
struct ext4_super_block *es;
|
|
|
|
ext4_fsblk_t bitmap_count;
|
2006-10-11 08:20:50 +00:00
|
|
|
unsigned long x;
|
|
|
|
struct buffer_head *bitmap_bh = NULL;
|
|
|
|
|
2006-10-11 08:20:53 +00:00
|
|
|
es = EXT4_SB(sb)->s_es;
|
2006-10-11 08:20:50 +00:00
|
|
|
desc_count = 0;
|
|
|
|
bitmap_count = 0;
|
|
|
|
gdp = NULL;
|
|
|
|
|
|
|
|
smp_rmb();
|
|
|
|
for (i = 0; i < ngroups; i++) {
|
2006-10-11 08:20:53 +00:00
|
|
|
gdp = ext4_get_group_desc(sb, i, NULL);
|
2006-10-11 08:20:50 +00:00
|
|
|
if (!gdp)
|
|
|
|
continue;
|
|
|
|
desc_count += le16_to_cpu(gdp->bg_free_blocks_count);
|
|
|
|
brelse(bitmap_bh);
|
2008-07-11 23:27:31 +00:00
|
|
|
bitmap_bh = ext4_read_block_bitmap(sb, i);
|
2006-10-11 08:20:50 +00:00
|
|
|
if (bitmap_bh == NULL)
|
|
|
|
continue;
|
|
|
|
|
2006-10-11 08:20:53 +00:00
|
|
|
x = ext4_count_free(bitmap_bh, sb->s_blocksize);
|
2008-01-29 04:58:27 +00:00
|
|
|
printk(KERN_DEBUG "group %lu: stored = %d, counted = %lu\n",
|
2006-10-11 08:20:50 +00:00
|
|
|
i, le16_to_cpu(gdp->bg_free_blocks_count), x);
|
|
|
|
bitmap_count += x;
|
|
|
|
}
|
|
|
|
brelse(bitmap_bh);
|
2008-09-09 03:00:52 +00:00
|
|
|
printk(KERN_DEBUG "ext4_count_free_blocks: stored = %llu"
|
|
|
|
", computed = %llu, %llu\n", ext4_free_blocks_count(es),
|
|
|
|
desc_count, bitmap_count);
|
2006-10-11 08:20:50 +00:00
|
|
|
return bitmap_count;
|
|
|
|
#else
|
|
|
|
desc_count = 0;
|
|
|
|
smp_rmb();
|
|
|
|
for (i = 0; i < ngroups; i++) {
|
2006-10-11 08:20:53 +00:00
|
|
|
gdp = ext4_get_group_desc(sb, i, NULL);
|
2006-10-11 08:20:50 +00:00
|
|
|
if (!gdp)
|
|
|
|
continue;
|
|
|
|
desc_count += le16_to_cpu(gdp->bg_free_blocks_count);
|
|
|
|
}
|
|
|
|
|
|
|
|
return desc_count;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2008-01-29 04:58:27 +00:00
|
|
|
static inline int test_root(ext4_group_t a, int b)
|
2006-10-11 08:20:50 +00:00
|
|
|
{
|
|
|
|
int num = b;
|
|
|
|
|
|
|
|
while (a > num)
|
|
|
|
num *= b;
|
|
|
|
return num == a;
|
|
|
|
}
|
|
|
|
|
2008-01-29 04:58:27 +00:00
|
|
|
static int ext4_group_sparse(ext4_group_t group)
|
2006-10-11 08:20:50 +00:00
|
|
|
{
|
|
|
|
if (group <= 1)
|
|
|
|
return 1;
|
|
|
|
if (!(group & 1))
|
|
|
|
return 0;
|
|
|
|
return (test_root(group, 7) || test_root(group, 5) ||
|
|
|
|
test_root(group, 3));
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2006-10-11 08:20:53 +00:00
|
|
|
* ext4_bg_has_super - number of blocks used by the superblock in group
|
2006-10-11 08:20:50 +00:00
|
|
|
* @sb: superblock for filesystem
|
|
|
|
* @group: group number to check
|
|
|
|
*
|
|
|
|
* Return the number of blocks used by the superblock (primary or backup)
|
|
|
|
* in this group. Currently this will be only 0 or 1.
|
|
|
|
*/
|
2008-01-29 04:58:27 +00:00
|
|
|
int ext4_bg_has_super(struct super_block *sb, ext4_group_t group)
|
2006-10-11 08:20:50 +00:00
|
|
|
{
|
2006-10-11 08:20:53 +00:00
|
|
|
if (EXT4_HAS_RO_COMPAT_FEATURE(sb,
|
|
|
|
EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER) &&
|
|
|
|
!ext4_group_sparse(group))
|
2006-10-11 08:20:50 +00:00
|
|
|
return 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2008-01-29 04:58:27 +00:00
|
|
|
static unsigned long ext4_bg_num_gdb_meta(struct super_block *sb,
|
|
|
|
ext4_group_t group)
|
2006-10-11 08:20:50 +00:00
|
|
|
{
|
2006-10-11 08:20:53 +00:00
|
|
|
unsigned long metagroup = group / EXT4_DESC_PER_BLOCK(sb);
|
2008-01-29 04:58:27 +00:00
|
|
|
ext4_group_t first = metagroup * EXT4_DESC_PER_BLOCK(sb);
|
|
|
|
ext4_group_t last = first + EXT4_DESC_PER_BLOCK(sb) - 1;
|
2006-10-11 08:20:50 +00:00
|
|
|
|
|
|
|
if (group == first || group == first + 1 || group == last)
|
|
|
|
return 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-01-29 04:58:27 +00:00
|
|
|
static unsigned long ext4_bg_num_gdb_nometa(struct super_block *sb,
|
|
|
|
ext4_group_t group)
|
2006-10-11 08:20:50 +00:00
|
|
|
{
|
2008-02-06 09:40:17 +00:00
|
|
|
return ext4_bg_has_super(sb, group) ? EXT4_SB(sb)->s_gdb_count : 0;
|
2006-10-11 08:20:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2006-10-11 08:20:53 +00:00
|
|
|
* ext4_bg_num_gdb - number of blocks used by the group table in group
|
2006-10-11 08:20:50 +00:00
|
|
|
* @sb: superblock for filesystem
|
|
|
|
* @group: group number to check
|
|
|
|
*
|
|
|
|
* Return the number of blocks used by the group descriptor table
|
|
|
|
* (primary or backup) in this group. In the future there may be a
|
|
|
|
* different number of descriptor blocks in each group.
|
|
|
|
*/
|
2008-01-29 04:58:27 +00:00
|
|
|
unsigned long ext4_bg_num_gdb(struct super_block *sb, ext4_group_t group)
|
2006-10-11 08:20:50 +00:00
|
|
|
{
|
|
|
|
unsigned long first_meta_bg =
|
2006-10-11 08:20:53 +00:00
|
|
|
le32_to_cpu(EXT4_SB(sb)->s_es->s_first_meta_bg);
|
|
|
|
unsigned long metagroup = group / EXT4_DESC_PER_BLOCK(sb);
|
2006-10-11 08:20:50 +00:00
|
|
|
|
2006-10-11 08:20:53 +00:00
|
|
|
if (!EXT4_HAS_INCOMPAT_FEATURE(sb,EXT4_FEATURE_INCOMPAT_META_BG) ||
|
2006-10-11 08:20:50 +00:00
|
|
|
metagroup < first_meta_bg)
|
2008-09-09 02:25:24 +00:00
|
|
|
return ext4_bg_num_gdb_nometa(sb, group);
|
2006-10-11 08:20:50 +00:00
|
|
|
|
2006-10-11 08:20:53 +00:00
|
|
|
return ext4_bg_num_gdb_meta(sb,group);
|
2006-10-11 08:20:50 +00:00
|
|
|
|
|
|
|
}
|
2008-10-10 13:40:52 +00:00
|
|
|
|