2006-10-11 12:20:50 +04:00
|
|
|
/*
|
2006-10-11 12:20:53 +04:00
|
|
|
* linux/fs/ext4/ialloc.c
|
2006-10-11 12:20:50 +04: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)
|
|
|
|
*
|
|
|
|
* BSD ufs-inspired inode and directory 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/fs.h>
|
2006-10-11 12:21:01 +04:00
|
|
|
#include <linux/jbd2.h>
|
2006-10-11 12:20:50 +04:00
|
|
|
#include <linux/stat.h>
|
|
|
|
#include <linux/string.h>
|
|
|
|
#include <linux/quotaops.h>
|
|
|
|
#include <linux/buffer_head.h>
|
|
|
|
#include <linux/random.h>
|
|
|
|
#include <linux/bitops.h>
|
2006-10-11 12:21:05 +04:00
|
|
|
#include <linux/blkdev.h>
|
2006-10-11 12:20:50 +04:00
|
|
|
#include <asm/byteorder.h>
|
2009-06-17 19:48:11 +04:00
|
|
|
|
2008-04-30 02:13:32 +04:00
|
|
|
#include "ext4.h"
|
|
|
|
#include "ext4_jbd2.h"
|
2006-10-11 12:20:50 +04:00
|
|
|
#include "xattr.h"
|
|
|
|
#include "acl.h"
|
|
|
|
|
2009-06-17 19:48:11 +04:00
|
|
|
#include <trace/events/ext4.h>
|
|
|
|
|
2006-10-11 12:20:50 +04:00
|
|
|
/*
|
|
|
|
* ialloc.c contains the inodes allocation and deallocation routines
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The free inodes 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.
|
|
|
|
*/
|
|
|
|
|
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-17 02:38:25 +04:00
|
|
|
/*
|
|
|
|
* To avoid calling the atomic setbit hundreds or thousands of times, we only
|
|
|
|
* need to use it within a single byte (to ensure we get endianness right).
|
|
|
|
* We can use memset for the rest of the bitmap as there are no other users.
|
|
|
|
*/
|
|
|
|
void mark_bitmap_end(int start_bit, int end_bit, char *bitmap)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (start_bit >= end_bit)
|
|
|
|
return;
|
|
|
|
|
|
|
|
ext4_debug("mark end bits +%d through +%d used\n", start_bit, end_bit);
|
|
|
|
for (i = start_bit; i < ((start_bit + 7) & ~7UL); i++)
|
|
|
|
ext4_set_bit(i, bitmap);
|
|
|
|
if (i < end_bit)
|
|
|
|
memset(bitmap + (i >> 3), 0xff, (end_bit - i) >> 3);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Initializes an uninitialized inode bitmap */
|
2008-01-29 07:58:27 +03:00
|
|
|
unsigned ext4_init_inode_bitmap(struct super_block *sb, struct buffer_head *bh,
|
|
|
|
ext4_group_t 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-17 02:38:25 +04:00
|
|
|
struct ext4_group_desc *gdp)
|
|
|
|
{
|
|
|
|
struct ext4_sb_info *sbi = EXT4_SB(sb);
|
|
|
|
|
|
|
|
J_ASSERT_BH(bh, buffer_locked(bh));
|
|
|
|
|
|
|
|
/* If checksum is bad mark all blocks and inodes use to prevent
|
|
|
|
* allocation, essentially implementing a per-group read-only flag. */
|
|
|
|
if (!ext4_group_desc_csum_verify(sbi, block_group, gdp)) {
|
2010-02-15 22:19:27 +03:00
|
|
|
ext4_error(sb, "Checksum bad for group %u", block_group);
|
2009-01-06 06:20:24 +03:00
|
|
|
ext4_free_blks_set(sb, gdp, 0);
|
|
|
|
ext4_free_inodes_set(sb, gdp, 0);
|
|
|
|
ext4_itable_unused_set(sb, gdp, 0);
|
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-17 02:38:25 +04:00
|
|
|
memset(bh->b_data, 0xff, sb->s_blocksize);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
memset(bh->b_data, 0, (EXT4_INODES_PER_GROUP(sb) + 7) / 8);
|
2009-01-06 05:46:04 +03:00
|
|
|
mark_bitmap_end(EXT4_INODES_PER_GROUP(sb), sb->s_blocksize * 8,
|
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-17 02:38:25 +04:00
|
|
|
bh->b_data);
|
|
|
|
|
|
|
|
return EXT4_INODES_PER_GROUP(sb);
|
|
|
|
}
|
2006-10-11 12:20:50 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Read the inode allocation bitmap for a given block_group, reading
|
|
|
|
* into the specified slot in the superblock's bitmap cache.
|
|
|
|
*
|
|
|
|
* Return buffer_head of bitmap on success or NULL.
|
|
|
|
*/
|
|
|
|
static struct buffer_head *
|
2008-08-03 05:21:02 +04:00
|
|
|
ext4_read_inode_bitmap(struct super_block *sb, ext4_group_t block_group)
|
2006-10-11 12:20:50 +04:00
|
|
|
{
|
2006-10-11 12:20:53 +04:00
|
|
|
struct ext4_group_desc *desc;
|
2006-10-11 12:20:50 +04:00
|
|
|
struct buffer_head *bh = NULL;
|
2008-08-03 05:21:02 +04:00
|
|
|
ext4_fsblk_t bitmap_blk;
|
2006-10-11 12:20:50 +04:00
|
|
|
|
2006-10-11 12:20:53 +04:00
|
|
|
desc = ext4_get_group_desc(sb, block_group, NULL);
|
2006-10-11 12:20:50 +04:00
|
|
|
if (!desc)
|
2008-08-03 05:21:02 +04:00
|
|
|
return NULL;
|
|
|
|
bitmap_blk = ext4_inode_bitmap(sb, desc);
|
|
|
|
bh = sb_getblk(sb, bitmap_blk);
|
|
|
|
if (unlikely(!bh)) {
|
2010-02-15 22:19:27 +03:00
|
|
|
ext4_error(sb, "Cannot read inode bitmap - "
|
2009-01-06 06:18:16 +03:00
|
|
|
"block_group = %u, inode_bitmap = %llu",
|
2008-08-03 05:21:02 +04:00
|
|
|
block_group, bitmap_blk);
|
|
|
|
return NULL;
|
|
|
|
}
|
2009-01-06 05:49:55 +03:00
|
|
|
if (bitmap_uptodate(bh))
|
2008-08-03 05:21:02 +04: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 16:09:18 +04:00
|
|
|
lock_buffer(bh);
|
2009-01-06 05:49:55 +03:00
|
|
|
if (bitmap_uptodate(bh)) {
|
|
|
|
unlock_buffer(bh);
|
|
|
|
return bh;
|
|
|
|
}
|
2009-05-03 04:35:09 +04:00
|
|
|
ext4_lock_group(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-17 02:38:25 +04:00
|
|
|
if (desc->bg_flags & cpu_to_le16(EXT4_BG_INODE_UNINIT)) {
|
2008-08-03 05:21:02 +04:00
|
|
|
ext4_init_inode_bitmap(sb, bh, block_group, desc);
|
2009-01-06 05:49:55 +03:00
|
|
|
set_bitmap_uptodate(bh);
|
2008-08-03 05:21:02 +04:00
|
|
|
set_buffer_uptodate(bh);
|
2009-05-03 04:35:09 +04:00
|
|
|
ext4_unlock_group(sb, block_group);
|
2009-01-04 06:33:39 +03:00
|
|
|
unlock_buffer(bh);
|
2008-08-03 05:21:02 +04: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-17 02:38:25 +04:00
|
|
|
}
|
2009-05-03 04:35:09 +04:00
|
|
|
ext4_unlock_group(sb, block_group);
|
2009-01-06 05:49:55 +03:00
|
|
|
if (buffer_uptodate(bh)) {
|
|
|
|
/*
|
|
|
|
* if not uninit if bh is uptodate,
|
|
|
|
* bitmap is also uptodate
|
|
|
|
*/
|
|
|
|
set_bitmap_uptodate(bh);
|
|
|
|
unlock_buffer(bh);
|
|
|
|
return bh;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* submit the buffer_head for read. We can
|
|
|
|
* safely mark the bitmap as uptodate now.
|
|
|
|
* We do it here so the bitmap uptodate bit
|
|
|
|
* get set with buffer lock held.
|
|
|
|
*/
|
|
|
|
set_bitmap_uptodate(bh);
|
2008-08-03 05:21:02 +04:00
|
|
|
if (bh_submit_read(bh) < 0) {
|
|
|
|
put_bh(bh);
|
2010-02-15 22:19:27 +03:00
|
|
|
ext4_error(sb, "Cannot read inode bitmap - "
|
2009-01-06 06:18:16 +03:00
|
|
|
"block_group = %u, inode_bitmap = %llu",
|
2008-08-03 05:21:02 +04:00
|
|
|
block_group, bitmap_blk);
|
|
|
|
return NULL;
|
|
|
|
}
|
2006-10-11 12:20:50 +04:00
|
|
|
return bh;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* NOTE! When we get the inode, we're the only people
|
|
|
|
* that have access to it, and as such there are no
|
|
|
|
* race conditions we have to worry about. The inode
|
|
|
|
* is not on the hash-lists, and it cannot be reached
|
|
|
|
* through the filesystem because the directory entry
|
|
|
|
* has been deleted earlier.
|
|
|
|
*
|
|
|
|
* HOWEVER: we must make sure that we get no aliases,
|
|
|
|
* which means that we have to call "clear_inode()"
|
|
|
|
* _before_ we mark the inode not in use in the inode
|
|
|
|
* bitmaps. Otherwise a newly created file might use
|
|
|
|
* the same inode number (not actually the same pointer
|
|
|
|
* though), and then we'd have two inodes sharing the
|
|
|
|
* same inode number and space on the harddisk.
|
|
|
|
*/
|
2008-09-09 06:25:24 +04:00
|
|
|
void ext4_free_inode(handle_t *handle, struct inode *inode)
|
2006-10-11 12:20:50 +04:00
|
|
|
{
|
2008-09-09 06:25:24 +04:00
|
|
|
struct super_block *sb = inode->i_sb;
|
2006-10-11 12:20:50 +04:00
|
|
|
int is_directory;
|
|
|
|
unsigned long ino;
|
|
|
|
struct buffer_head *bitmap_bh = NULL;
|
|
|
|
struct buffer_head *bh2;
|
2008-01-29 07:58:27 +03:00
|
|
|
ext4_group_t block_group;
|
2006-10-11 12:20:50 +04:00
|
|
|
unsigned long bit;
|
2008-09-09 06:25:24 +04:00
|
|
|
struct ext4_group_desc *gdp;
|
|
|
|
struct ext4_super_block *es;
|
2006-10-11 12:20:53 +04:00
|
|
|
struct ext4_sb_info *sbi;
|
2009-03-05 02:38:18 +03:00
|
|
|
int fatal = 0, err, count, cleared;
|
2006-10-11 12:20:50 +04:00
|
|
|
|
|
|
|
if (atomic_read(&inode->i_count) > 1) {
|
2008-09-09 07:00:52 +04:00
|
|
|
printk(KERN_ERR "ext4_free_inode: inode has count=%d\n",
|
|
|
|
atomic_read(&inode->i_count));
|
2006-10-11 12:20:50 +04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (inode->i_nlink) {
|
2008-09-09 07:00:52 +04:00
|
|
|
printk(KERN_ERR "ext4_free_inode: inode has nlink=%d\n",
|
|
|
|
inode->i_nlink);
|
2006-10-11 12:20:50 +04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (!sb) {
|
2008-09-09 07:00:52 +04:00
|
|
|
printk(KERN_ERR "ext4_free_inode: inode on "
|
|
|
|
"nonexistent device\n");
|
2006-10-11 12:20:50 +04:00
|
|
|
return;
|
|
|
|
}
|
2006-10-11 12:20:53 +04:00
|
|
|
sbi = EXT4_SB(sb);
|
2006-10-11 12:20:50 +04:00
|
|
|
|
|
|
|
ino = inode->i_ino;
|
2008-09-09 06:25:24 +04:00
|
|
|
ext4_debug("freeing inode %lu\n", ino);
|
2009-06-17 19:48:11 +04:00
|
|
|
trace_ext4_free_inode(inode);
|
2006-10-11 12:20:50 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Note: we must free any quota before locking the superblock,
|
|
|
|
* as writing the quota to disk may need the lock as well.
|
|
|
|
*/
|
2010-03-03 17:05:07 +03:00
|
|
|
dquot_initialize(inode);
|
2006-10-11 12:20:53 +04:00
|
|
|
ext4_xattr_delete_inode(handle, inode);
|
2010-03-03 17:05:01 +03:00
|
|
|
dquot_free_inode(inode);
|
2010-03-03 17:05:05 +03:00
|
|
|
dquot_drop(inode);
|
2006-10-11 12:20:50 +04:00
|
|
|
|
|
|
|
is_directory = S_ISDIR(inode->i_mode);
|
|
|
|
|
|
|
|
/* Do this BEFORE marking the inode not in use or returning an error */
|
2010-06-07 21:16:22 +04:00
|
|
|
ext4_clear_inode(inode);
|
2006-10-11 12:20:50 +04:00
|
|
|
|
2006-10-11 12:20:53 +04:00
|
|
|
es = EXT4_SB(sb)->s_es;
|
|
|
|
if (ino < EXT4_FIRST_INO(sb) || ino > le32_to_cpu(es->s_inodes_count)) {
|
2010-02-15 22:19:27 +03:00
|
|
|
ext4_error(sb, "reserved or nonexistent inode %lu", ino);
|
2006-10-11 12:20:50 +04:00
|
|
|
goto error_return;
|
|
|
|
}
|
2006-10-11 12:20:53 +04:00
|
|
|
block_group = (ino - 1) / EXT4_INODES_PER_GROUP(sb);
|
|
|
|
bit = (ino - 1) % EXT4_INODES_PER_GROUP(sb);
|
2008-08-03 05:21:02 +04:00
|
|
|
bitmap_bh = ext4_read_inode_bitmap(sb, block_group);
|
2006-10-11 12:20:50 +04:00
|
|
|
if (!bitmap_bh)
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
BUFFER_TRACE(bitmap_bh, "get_write_access");
|
2006-10-11 12:20:53 +04:00
|
|
|
fatal = ext4_journal_get_write_access(handle, bitmap_bh);
|
2006-10-11 12:20:50 +04:00
|
|
|
if (fatal)
|
|
|
|
goto error_return;
|
|
|
|
|
2010-05-16 15:00:00 +04:00
|
|
|
fatal = -ESRCH;
|
|
|
|
gdp = ext4_get_group_desc(sb, block_group, &bh2);
|
|
|
|
if (gdp) {
|
2006-10-11 12:20:50 +04:00
|
|
|
BUFFER_TRACE(bh2, "get_write_access");
|
2006-10-11 12:20:53 +04:00
|
|
|
fatal = ext4_journal_get_write_access(handle, bh2);
|
2010-05-16 15:00:00 +04:00
|
|
|
}
|
|
|
|
ext4_lock_group(sb, block_group);
|
|
|
|
cleared = ext4_clear_bit(bit, bitmap_bh->b_data);
|
|
|
|
if (fatal || !cleared) {
|
|
|
|
ext4_unlock_group(sb, block_group);
|
|
|
|
goto out;
|
|
|
|
}
|
2009-03-05 03:31:53 +03:00
|
|
|
|
2010-05-16 15:00:00 +04:00
|
|
|
count = ext4_free_inodes_count(sb, gdp) + 1;
|
|
|
|
ext4_free_inodes_set(sb, gdp, count);
|
|
|
|
if (is_directory) {
|
|
|
|
count = ext4_used_dirs_count(sb, gdp) - 1;
|
|
|
|
ext4_used_dirs_set(sb, gdp, count);
|
|
|
|
percpu_counter_dec(&sbi->s_dirs_counter);
|
2006-10-11 12:20:50 +04:00
|
|
|
}
|
2010-05-16 15:00:00 +04:00
|
|
|
gdp->bg_checksum = ext4_group_desc_csum(sbi, block_group, gdp);
|
|
|
|
ext4_unlock_group(sb, block_group);
|
2006-10-11 12:20:50 +04:00
|
|
|
|
2010-05-16 15:00:00 +04:00
|
|
|
percpu_counter_inc(&sbi->s_freeinodes_counter);
|
|
|
|
if (sbi->s_log_groups_per_flex) {
|
|
|
|
ext4_group_t f = ext4_flex_group(sbi, block_group);
|
2009-03-05 03:09:10 +03:00
|
|
|
|
2010-05-16 15:00:00 +04:00
|
|
|
atomic_inc(&sbi->s_flex_groups[f].free_inodes);
|
|
|
|
if (is_directory)
|
|
|
|
atomic_dec(&sbi->s_flex_groups[f].used_dirs);
|
2006-10-11 12:20:50 +04:00
|
|
|
}
|
2010-05-16 15:00:00 +04:00
|
|
|
BUFFER_TRACE(bh2, "call ext4_handle_dirty_metadata");
|
|
|
|
fatal = ext4_handle_dirty_metadata(handle, NULL, bh2);
|
|
|
|
out:
|
|
|
|
if (cleared) {
|
|
|
|
BUFFER_TRACE(bitmap_bh, "call ext4_handle_dirty_metadata");
|
|
|
|
err = ext4_handle_dirty_metadata(handle, NULL, bitmap_bh);
|
|
|
|
if (!fatal)
|
|
|
|
fatal = err;
|
2010-06-12 07:14:04 +04:00
|
|
|
ext4_mark_super_dirty(sb);
|
2010-05-16 15:00:00 +04:00
|
|
|
} else
|
|
|
|
ext4_error(sb, "bit already cleared for inode %lu", ino);
|
|
|
|
|
2006-10-11 12:20:50 +04:00
|
|
|
error_return:
|
|
|
|
brelse(bitmap_bh);
|
2006-10-11 12:20:53 +04:00
|
|
|
ext4_std_error(sb, fatal);
|
2006-10-11 12:20:50 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 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.
|
|
|
|
*/
|
2008-01-29 07:58:27 +03:00
|
|
|
static int find_group_dir(struct super_block *sb, struct inode *parent,
|
|
|
|
ext4_group_t *best_group)
|
2006-10-11 12:20:50 +04:00
|
|
|
{
|
2009-05-01 16:50:38 +04:00
|
|
|
ext4_group_t ngroups = ext4_get_groups_count(sb);
|
2006-10-11 12:20:50 +04:00
|
|
|
unsigned int freei, avefreei;
|
2006-10-11 12:20:53 +04:00
|
|
|
struct ext4_group_desc *desc, *best_desc = NULL;
|
2008-01-29 07:58:27 +03:00
|
|
|
ext4_group_t group;
|
|
|
|
int ret = -1;
|
2006-10-11 12:20:50 +04:00
|
|
|
|
2006-10-11 12:20:53 +04:00
|
|
|
freei = percpu_counter_read_positive(&EXT4_SB(sb)->s_freeinodes_counter);
|
2006-10-11 12:20:50 +04:00
|
|
|
avefreei = freei / ngroups;
|
|
|
|
|
|
|
|
for (group = 0; group < ngroups; group++) {
|
2008-09-09 06:25:24 +04:00
|
|
|
desc = ext4_get_group_desc(sb, group, NULL);
|
2009-01-06 06:20:24 +03:00
|
|
|
if (!desc || !ext4_free_inodes_count(sb, desc))
|
2006-10-11 12:20:50 +04:00
|
|
|
continue;
|
2009-01-06 06:20:24 +03:00
|
|
|
if (ext4_free_inodes_count(sb, desc) < avefreei)
|
2006-10-11 12:20:50 +04:00
|
|
|
continue;
|
|
|
|
if (!best_desc ||
|
2009-01-06 06:20:24 +03:00
|
|
|
(ext4_free_blks_count(sb, desc) >
|
|
|
|
ext4_free_blks_count(sb, best_desc))) {
|
2008-01-29 07:58:27 +03:00
|
|
|
*best_group = group;
|
2006-10-11 12:20:50 +04:00
|
|
|
best_desc = desc;
|
2008-01-29 07:58:27 +03:00
|
|
|
ret = 0;
|
2006-10-11 12:20:50 +04:00
|
|
|
}
|
|
|
|
}
|
2008-01-29 07:58:27 +03:00
|
|
|
return ret;
|
2006-10-11 12:20:50 +04:00
|
|
|
}
|
|
|
|
|
2008-07-12 03:27:31 +04:00
|
|
|
#define free_block_ratio 10
|
|
|
|
|
|
|
|
static int find_group_flex(struct super_block *sb, struct inode *parent,
|
|
|
|
ext4_group_t *best_group)
|
|
|
|
{
|
|
|
|
struct ext4_sb_info *sbi = EXT4_SB(sb);
|
|
|
|
struct ext4_group_desc *desc;
|
|
|
|
struct flex_groups *flex_group = sbi->s_flex_groups;
|
|
|
|
ext4_group_t parent_group = EXT4_I(parent)->i_block_group;
|
|
|
|
ext4_group_t parent_fbg_group = ext4_flex_group(sbi, parent_group);
|
2009-05-01 16:50:38 +04:00
|
|
|
ext4_group_t ngroups = ext4_get_groups_count(sb);
|
2008-07-12 03:27:31 +04:00
|
|
|
int flex_size = ext4_flex_bg_size(sbi);
|
|
|
|
ext4_group_t best_flex = parent_fbg_group;
|
|
|
|
int blocks_per_flex = sbi->s_blocks_per_group * flex_size;
|
|
|
|
int flexbg_free_blocks;
|
|
|
|
int flex_freeb_ratio;
|
|
|
|
ext4_group_t n_fbg_groups;
|
|
|
|
ext4_group_t i;
|
|
|
|
|
2009-05-01 16:50:38 +04:00
|
|
|
n_fbg_groups = (ngroups + flex_size - 1) >>
|
2008-07-12 03:27:31 +04:00
|
|
|
sbi->s_log_groups_per_flex;
|
|
|
|
|
|
|
|
find_close_to_parent:
|
2009-03-05 03:09:10 +03:00
|
|
|
flexbg_free_blocks = atomic_read(&flex_group[best_flex].free_blocks);
|
2008-07-12 03:27:31 +04:00
|
|
|
flex_freeb_ratio = flexbg_free_blocks * 100 / blocks_per_flex;
|
2009-03-05 03:09:10 +03:00
|
|
|
if (atomic_read(&flex_group[best_flex].free_inodes) &&
|
2008-07-12 03:27:31 +04:00
|
|
|
flex_freeb_ratio > free_block_ratio)
|
|
|
|
goto found_flexbg;
|
|
|
|
|
|
|
|
if (best_flex && best_flex == parent_fbg_group) {
|
|
|
|
best_flex--;
|
|
|
|
goto find_close_to_parent;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < n_fbg_groups; i++) {
|
|
|
|
if (i == parent_fbg_group || i == parent_fbg_group - 1)
|
|
|
|
continue;
|
|
|
|
|
2009-03-05 03:09:10 +03:00
|
|
|
flexbg_free_blocks = atomic_read(&flex_group[i].free_blocks);
|
2008-07-12 03:27:31 +04:00
|
|
|
flex_freeb_ratio = flexbg_free_blocks * 100 / blocks_per_flex;
|
|
|
|
|
|
|
|
if (flex_freeb_ratio > free_block_ratio &&
|
2009-03-05 03:09:10 +03:00
|
|
|
(atomic_read(&flex_group[i].free_inodes))) {
|
2008-07-12 03:27:31 +04:00
|
|
|
best_flex = i;
|
|
|
|
goto found_flexbg;
|
|
|
|
}
|
|
|
|
|
2009-03-05 03:09:10 +03:00
|
|
|
if ((atomic_read(&flex_group[best_flex].free_inodes) == 0) ||
|
|
|
|
((atomic_read(&flex_group[i].free_blocks) >
|
|
|
|
atomic_read(&flex_group[best_flex].free_blocks)) &&
|
|
|
|
atomic_read(&flex_group[i].free_inodes)))
|
2008-07-12 03:27:31 +04:00
|
|
|
best_flex = i;
|
|
|
|
}
|
|
|
|
|
2009-03-05 03:09:10 +03:00
|
|
|
if (!atomic_read(&flex_group[best_flex].free_inodes) ||
|
|
|
|
!atomic_read(&flex_group[best_flex].free_blocks))
|
2008-07-12 03:27:31 +04:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
found_flexbg:
|
|
|
|
for (i = best_flex * flex_size; i < ngroups &&
|
|
|
|
i < (best_flex + 1) * flex_size; i++) {
|
2009-05-25 19:50:39 +04:00
|
|
|
desc = ext4_get_group_desc(sb, i, NULL);
|
2009-01-06 06:20:24 +03:00
|
|
|
if (ext4_free_inodes_count(sb, desc)) {
|
2008-07-12 03:27:31 +04:00
|
|
|
*best_group = i;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
out:
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-03-12 19:18:34 +03:00
|
|
|
struct orlov_stats {
|
|
|
|
__u32 free_inodes;
|
|
|
|
__u32 free_blocks;
|
|
|
|
__u32 used_dirs;
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Helper function for Orlov's allocator; returns critical information
|
|
|
|
* for a particular block group or flex_bg. If flex_size is 1, then g
|
|
|
|
* is a block group number; otherwise it is flex_bg number.
|
|
|
|
*/
|
|
|
|
void get_orlov_stats(struct super_block *sb, ext4_group_t g,
|
|
|
|
int flex_size, struct orlov_stats *stats)
|
|
|
|
{
|
|
|
|
struct ext4_group_desc *desc;
|
2009-03-05 03:31:53 +03:00
|
|
|
struct flex_groups *flex_group = EXT4_SB(sb)->s_flex_groups;
|
2009-03-12 19:18:34 +03:00
|
|
|
|
2009-03-05 03:31:53 +03:00
|
|
|
if (flex_size > 1) {
|
|
|
|
stats->free_inodes = atomic_read(&flex_group[g].free_inodes);
|
|
|
|
stats->free_blocks = atomic_read(&flex_group[g].free_blocks);
|
|
|
|
stats->used_dirs = atomic_read(&flex_group[g].used_dirs);
|
|
|
|
return;
|
|
|
|
}
|
2009-03-12 19:18:34 +03:00
|
|
|
|
2009-03-05 03:31:53 +03:00
|
|
|
desc = ext4_get_group_desc(sb, g, NULL);
|
|
|
|
if (desc) {
|
|
|
|
stats->free_inodes = ext4_free_inodes_count(sb, desc);
|
|
|
|
stats->free_blocks = ext4_free_blks_count(sb, desc);
|
|
|
|
stats->used_dirs = ext4_used_dirs_count(sb, desc);
|
|
|
|
} else {
|
|
|
|
stats->free_inodes = 0;
|
|
|
|
stats->free_blocks = 0;
|
|
|
|
stats->used_dirs = 0;
|
2009-03-12 19:18:34 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-10-11 12:20:50 +04:00
|
|
|
/*
|
|
|
|
* 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
|
2008-04-22 02:45:55 +04:00
|
|
|
* Parent's group is preferred, if it doesn't satisfy these
|
2006-10-11 12:20:50 +04:00
|
|
|
* 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).
|
|
|
|
*/
|
|
|
|
|
2008-01-29 07:58:27 +03:00
|
|
|
static int find_group_orlov(struct super_block *sb, struct inode *parent,
|
2009-06-13 19:09:42 +04:00
|
|
|
ext4_group_t *group, int mode,
|
|
|
|
const struct qstr *qstr)
|
2006-10-11 12:20:50 +04:00
|
|
|
{
|
2008-01-29 07:58:27 +03:00
|
|
|
ext4_group_t parent_group = EXT4_I(parent)->i_block_group;
|
2006-10-11 12:20:53 +04:00
|
|
|
struct ext4_sb_info *sbi = EXT4_SB(sb);
|
2009-05-01 16:50:38 +04:00
|
|
|
ext4_group_t real_ngroups = ext4_get_groups_count(sb);
|
2006-10-11 12:20:53 +04:00
|
|
|
int inodes_per_group = EXT4_INODES_PER_GROUP(sb);
|
2006-10-11 12:20:50 +04:00
|
|
|
unsigned int freei, avefreei;
|
2006-10-11 12:20:53 +04:00
|
|
|
ext4_fsblk_t freeb, avefreeb;
|
2006-10-11 12:20:50 +04:00
|
|
|
unsigned int ndirs;
|
2009-03-12 19:18:34 +03:00
|
|
|
int max_dirs, min_inodes;
|
2006-10-11 12:20:53 +04:00
|
|
|
ext4_grpblk_t min_blocks;
|
2009-05-01 16:50:38 +04:00
|
|
|
ext4_group_t i, grp, g, ngroups;
|
2006-10-11 12:20:53 +04:00
|
|
|
struct ext4_group_desc *desc;
|
2009-03-12 19:18:34 +03:00
|
|
|
struct orlov_stats stats;
|
|
|
|
int flex_size = ext4_flex_bg_size(sbi);
|
2009-06-13 19:09:42 +04:00
|
|
|
struct dx_hash_info hinfo;
|
2009-03-12 19:18:34 +03:00
|
|
|
|
2009-05-01 16:50:38 +04:00
|
|
|
ngroups = real_ngroups;
|
2009-03-12 19:18:34 +03:00
|
|
|
if (flex_size > 1) {
|
2009-05-01 16:50:38 +04:00
|
|
|
ngroups = (real_ngroups + flex_size - 1) >>
|
2009-03-12 19:18:34 +03:00
|
|
|
sbi->s_log_groups_per_flex;
|
|
|
|
parent_group >>= sbi->s_log_groups_per_flex;
|
|
|
|
}
|
2006-10-11 12:20:50 +04:00
|
|
|
|
|
|
|
freei = percpu_counter_read_positive(&sbi->s_freeinodes_counter);
|
|
|
|
avefreei = freei / ngroups;
|
|
|
|
freeb = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
|
2006-10-11 12:21:05 +04:00
|
|
|
avefreeb = freeb;
|
2006-10-11 12:21:19 +04:00
|
|
|
do_div(avefreeb, ngroups);
|
2006-10-11 12:20:50 +04:00
|
|
|
ndirs = percpu_counter_read_positive(&sbi->s_dirs_counter);
|
|
|
|
|
2009-03-12 19:18:34 +03:00
|
|
|
if (S_ISDIR(mode) &&
|
|
|
|
((parent == sb->s_root->d_inode) ||
|
2010-05-17 06:00:00 +04:00
|
|
|
(ext4_test_inode_flag(parent, EXT4_INODE_TOPDIR)))) {
|
2006-10-11 12:20:50 +04:00
|
|
|
int best_ndir = inodes_per_group;
|
2008-01-29 07:58:27 +03:00
|
|
|
int ret = -1;
|
2006-10-11 12:20:50 +04:00
|
|
|
|
2009-06-13 19:09:42 +04:00
|
|
|
if (qstr) {
|
|
|
|
hinfo.hash_version = DX_HASH_HALF_MD4;
|
|
|
|
hinfo.seed = sbi->s_hash_seed;
|
|
|
|
ext4fs_dirhash(qstr->name, qstr->len, &hinfo);
|
|
|
|
grp = hinfo.hash;
|
|
|
|
} else
|
|
|
|
get_random_bytes(&grp, sizeof(grp));
|
2008-01-29 07:58:27 +03:00
|
|
|
parent_group = (unsigned)grp % ngroups;
|
2006-10-11 12:20:50 +04:00
|
|
|
for (i = 0; i < ngroups; i++) {
|
2009-03-12 19:18:34 +03:00
|
|
|
g = (parent_group + i) % ngroups;
|
|
|
|
get_orlov_stats(sb, g, flex_size, &stats);
|
|
|
|
if (!stats.free_inodes)
|
2006-10-11 12:20:50 +04:00
|
|
|
continue;
|
2009-03-12 19:18:34 +03:00
|
|
|
if (stats.used_dirs >= best_ndir)
|
2006-10-11 12:20:50 +04:00
|
|
|
continue;
|
2009-03-12 19:18:34 +03:00
|
|
|
if (stats.free_inodes < avefreei)
|
2006-10-11 12:20:50 +04:00
|
|
|
continue;
|
2009-03-12 19:18:34 +03:00
|
|
|
if (stats.free_blocks < avefreeb)
|
2006-10-11 12:20:50 +04:00
|
|
|
continue;
|
2009-03-12 19:18:34 +03:00
|
|
|
grp = g;
|
2008-01-29 07:58:27 +03:00
|
|
|
ret = 0;
|
2009-03-12 19:18:34 +03:00
|
|
|
best_ndir = stats.used_dirs;
|
|
|
|
}
|
|
|
|
if (ret)
|
|
|
|
goto fallback;
|
|
|
|
found_flex_bg:
|
|
|
|
if (flex_size == 1) {
|
|
|
|
*group = grp;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We pack inodes at the beginning of the flexgroup's
|
|
|
|
* inode tables. Block allocation decisions will do
|
|
|
|
* something similar, although regular files will
|
|
|
|
* start at 2nd block group of the flexgroup. See
|
|
|
|
* ext4_ext_find_goal() and ext4_find_near().
|
|
|
|
*/
|
|
|
|
grp *= flex_size;
|
|
|
|
for (i = 0; i < flex_size; i++) {
|
2009-05-01 16:50:38 +04:00
|
|
|
if (grp+i >= real_ngroups)
|
2009-03-12 19:18:34 +03:00
|
|
|
break;
|
|
|
|
desc = ext4_get_group_desc(sb, grp+i, NULL);
|
|
|
|
if (desc && ext4_free_inodes_count(sb, desc)) {
|
|
|
|
*group = grp+i;
|
|
|
|
return 0;
|
|
|
|
}
|
2006-10-11 12:20:50 +04:00
|
|
|
}
|
|
|
|
goto fallback;
|
|
|
|
}
|
|
|
|
|
|
|
|
max_dirs = ndirs / ngroups + inodes_per_group / 16;
|
2009-03-12 19:18:34 +03:00
|
|
|
min_inodes = avefreei - inodes_per_group*flex_size / 4;
|
|
|
|
if (min_inodes < 1)
|
|
|
|
min_inodes = 1;
|
|
|
|
min_blocks = avefreeb - EXT4_BLOCKS_PER_GROUP(sb)*flex_size / 4;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Start looking in the flex group where we last allocated an
|
|
|
|
* inode for this parent directory
|
|
|
|
*/
|
|
|
|
if (EXT4_I(parent)->i_last_alloc_group != ~0) {
|
|
|
|
parent_group = EXT4_I(parent)->i_last_alloc_group;
|
|
|
|
if (flex_size > 1)
|
|
|
|
parent_group >>= sbi->s_log_groups_per_flex;
|
|
|
|
}
|
2006-10-11 12:20:50 +04:00
|
|
|
|
|
|
|
for (i = 0; i < ngroups; i++) {
|
2009-03-12 19:18:34 +03:00
|
|
|
grp = (parent_group + i) % ngroups;
|
|
|
|
get_orlov_stats(sb, grp, flex_size, &stats);
|
|
|
|
if (stats.used_dirs >= max_dirs)
|
2006-10-11 12:20:50 +04:00
|
|
|
continue;
|
2009-03-12 19:18:34 +03:00
|
|
|
if (stats.free_inodes < min_inodes)
|
2006-10-11 12:20:50 +04:00
|
|
|
continue;
|
2009-03-12 19:18:34 +03:00
|
|
|
if (stats.free_blocks < min_blocks)
|
2006-10-11 12:20:50 +04:00
|
|
|
continue;
|
2009-03-12 19:18:34 +03:00
|
|
|
goto found_flex_bg;
|
2006-10-11 12:20:50 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
fallback:
|
2009-05-01 16:50:38 +04:00
|
|
|
ngroups = real_ngroups;
|
2009-03-12 19:18:34 +03:00
|
|
|
avefreei = freei / ngroups;
|
2009-04-23 05:00:36 +04:00
|
|
|
fallback_retry:
|
2009-03-12 19:18:34 +03:00
|
|
|
parent_group = EXT4_I(parent)->i_block_group;
|
2006-10-11 12:20:50 +04:00
|
|
|
for (i = 0; i < ngroups; i++) {
|
2009-03-12 19:18:34 +03:00
|
|
|
grp = (parent_group + i) % ngroups;
|
|
|
|
desc = ext4_get_group_desc(sb, grp, NULL);
|
2009-01-06 06:20:24 +03:00
|
|
|
if (desc && ext4_free_inodes_count(sb, desc) &&
|
2009-03-12 19:18:34 +03:00
|
|
|
ext4_free_inodes_count(sb, desc) >= avefreei) {
|
|
|
|
*group = grp;
|
2008-01-29 07:58:27 +03:00
|
|
|
return 0;
|
2009-03-12 19:18:34 +03:00
|
|
|
}
|
2006-10-11 12:20:50 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (avefreei) {
|
|
|
|
/*
|
|
|
|
* The free-inodes counter is approximate, and for really small
|
|
|
|
* filesystems the above test can fail to find any blockgroups
|
|
|
|
*/
|
|
|
|
avefreei = 0;
|
2009-04-23 05:00:36 +04:00
|
|
|
goto fallback_retry;
|
2006-10-11 12:20:50 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2008-01-29 07:58:27 +03:00
|
|
|
static int find_group_other(struct super_block *sb, struct inode *parent,
|
2009-03-12 19:18:34 +03:00
|
|
|
ext4_group_t *group, int mode)
|
2006-10-11 12:20:50 +04:00
|
|
|
{
|
2008-01-29 07:58:27 +03:00
|
|
|
ext4_group_t parent_group = EXT4_I(parent)->i_block_group;
|
2009-05-01 16:50:38 +04:00
|
|
|
ext4_group_t i, last, ngroups = ext4_get_groups_count(sb);
|
2006-10-11 12:20:53 +04:00
|
|
|
struct ext4_group_desc *desc;
|
2009-03-12 19:18:34 +03:00
|
|
|
int flex_size = ext4_flex_bg_size(EXT4_SB(sb));
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Try to place the inode is the same flex group as its
|
|
|
|
* parent. If we can't find space, use the Orlov algorithm to
|
|
|
|
* find another flex group, and store that information in the
|
|
|
|
* parent directory's inode information so that use that flex
|
|
|
|
* group for future allocations.
|
|
|
|
*/
|
|
|
|
if (flex_size > 1) {
|
|
|
|
int retry = 0;
|
|
|
|
|
|
|
|
try_again:
|
|
|
|
parent_group &= ~(flex_size-1);
|
|
|
|
last = parent_group + flex_size;
|
|
|
|
if (last > ngroups)
|
|
|
|
last = ngroups;
|
|
|
|
for (i = parent_group; i < last; i++) {
|
|
|
|
desc = ext4_get_group_desc(sb, i, NULL);
|
|
|
|
if (desc && ext4_free_inodes_count(sb, desc)) {
|
|
|
|
*group = i;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!retry && EXT4_I(parent)->i_last_alloc_group != ~0) {
|
|
|
|
retry = 1;
|
|
|
|
parent_group = EXT4_I(parent)->i_last_alloc_group;
|
|
|
|
goto try_again;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* If this didn't work, use the Orlov search algorithm
|
|
|
|
* to find a new flex group; we pass in the mode to
|
|
|
|
* avoid the topdir algorithms.
|
|
|
|
*/
|
|
|
|
*group = parent_group + flex_size;
|
|
|
|
if (*group > ngroups)
|
|
|
|
*group = 0;
|
2009-06-13 19:09:42 +04:00
|
|
|
return find_group_orlov(sb, parent, group, mode, 0);
|
2009-03-12 19:18:34 +03:00
|
|
|
}
|
2006-10-11 12:20:50 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Try to place the inode in its parent directory
|
|
|
|
*/
|
2008-01-29 07:58:27 +03:00
|
|
|
*group = parent_group;
|
|
|
|
desc = ext4_get_group_desc(sb, *group, NULL);
|
2009-01-06 06:20:24 +03:00
|
|
|
if (desc && ext4_free_inodes_count(sb, desc) &&
|
|
|
|
ext4_free_blks_count(sb, desc))
|
2008-01-29 07:58:27 +03:00
|
|
|
return 0;
|
2006-10-11 12:20:50 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* We're going to place this inode in a different blockgroup from its
|
|
|
|
* parent. We want to cause files in a common directory to all land in
|
|
|
|
* the same blockgroup. But we want files which are in a different
|
|
|
|
* directory which shares a blockgroup with our parent to land in a
|
|
|
|
* different blockgroup.
|
|
|
|
*
|
|
|
|
* So add our directory's i_ino into the starting point for the hash.
|
|
|
|
*/
|
2008-01-29 07:58:27 +03:00
|
|
|
*group = (*group + parent->i_ino) % ngroups;
|
2006-10-11 12:20:50 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Use a quadratic hash to find a group with a free inode and some free
|
|
|
|
* blocks.
|
|
|
|
*/
|
|
|
|
for (i = 1; i < ngroups; i <<= 1) {
|
2008-01-29 07:58:27 +03:00
|
|
|
*group += i;
|
|
|
|
if (*group >= ngroups)
|
|
|
|
*group -= ngroups;
|
|
|
|
desc = ext4_get_group_desc(sb, *group, NULL);
|
2009-01-06 06:20:24 +03:00
|
|
|
if (desc && ext4_free_inodes_count(sb, desc) &&
|
|
|
|
ext4_free_blks_count(sb, desc))
|
2008-01-29 07:58:27 +03:00
|
|
|
return 0;
|
2006-10-11 12:20:50 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* That failed: try linear search for a free inode, even if that group
|
|
|
|
* has no free blocks.
|
|
|
|
*/
|
2008-01-29 07:58:27 +03:00
|
|
|
*group = parent_group;
|
2006-10-11 12:20:50 +04:00
|
|
|
for (i = 0; i < ngroups; i++) {
|
2008-01-29 07:58:27 +03:00
|
|
|
if (++*group >= ngroups)
|
|
|
|
*group = 0;
|
|
|
|
desc = ext4_get_group_desc(sb, *group, NULL);
|
2009-01-06 06:20:24 +03:00
|
|
|
if (desc && ext4_free_inodes_count(sb, desc))
|
2008-01-29 07:58:27 +03:00
|
|
|
return 0;
|
2006-10-11 12:20:50 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
ext4: Fix the race between read_inode_bitmap() and ext4_new_inode()
We need to make sure we update the inode bitmap and clear
EXT4_BG_INODE_UNINIT flag with sb_bgl_lock held, since
ext4_read_inode_bitmap() looks at EXT4_BG_INODE_UNINIT to decide
whether to initialize the inode bitmap each time it is called.
(introduced by commit c806e68f.)
ext4_read_inode_bitmap does:
spin_lock(sb_bgl_lock(EXT4_SB(sb), block_group));
if (desc->bg_flags & cpu_to_le16(EXT4_BG_INODE_UNINIT)) {
ext4_init_inode_bitmap(sb, bh, block_group, desc);
and ext4_new_inode does
if (!ext4_set_bit_atomic(sb_bgl_lock(sbi, group),
ino, inode_bitmap_bh->b_data))
......
...
spin_lock(sb_bgl_lock(sbi, group));
gdp->bg_flags &= cpu_to_le16(~EXT4_BG_INODE_UNINIT);
i.e., on allocation we update the bitmap then we take the sb_bgl_lock
and clear the EXT4_BG_INODE_UNINIT flag. What can happen is a
parallel ext4_read_inode_bitmap can zero out the bitmap in between
the above ext4_set_bit_atomic and spin_lock(sb_bg_lock..)
The race results in below user visible errors
EXT4-fs error (device sdb1): ext4_free_inode: bit already cleared for inode 168449
EXT4-fs warning (device sdb1): ext4_unlink: Deleting nonexistent file ...
EXT4-fs warning (device sdb1): ext4_rmdir: empty directory has too many links ...
# ls -al /mnt/tmp/f/p369/d3/d6/d39/db2/dee/d10f/d3f/l71
ls: /mnt/tmp/f/p369/d3/d6/d39/db2/dee/d10f/d3f/l71: Stale NFS file handle
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@kernel.org
2009-01-06 05:38:14 +03:00
|
|
|
/*
|
|
|
|
* claim the inode from the inode bitmap. If the group
|
2009-05-03 04:35:09 +04:00
|
|
|
* is uninit we need to take the groups's ext4_group_lock
|
ext4: Fix the race between read_inode_bitmap() and ext4_new_inode()
We need to make sure we update the inode bitmap and clear
EXT4_BG_INODE_UNINIT flag with sb_bgl_lock held, since
ext4_read_inode_bitmap() looks at EXT4_BG_INODE_UNINIT to decide
whether to initialize the inode bitmap each time it is called.
(introduced by commit c806e68f.)
ext4_read_inode_bitmap does:
spin_lock(sb_bgl_lock(EXT4_SB(sb), block_group));
if (desc->bg_flags & cpu_to_le16(EXT4_BG_INODE_UNINIT)) {
ext4_init_inode_bitmap(sb, bh, block_group, desc);
and ext4_new_inode does
if (!ext4_set_bit_atomic(sb_bgl_lock(sbi, group),
ino, inode_bitmap_bh->b_data))
......
...
spin_lock(sb_bgl_lock(sbi, group));
gdp->bg_flags &= cpu_to_le16(~EXT4_BG_INODE_UNINIT);
i.e., on allocation we update the bitmap then we take the sb_bgl_lock
and clear the EXT4_BG_INODE_UNINIT flag. What can happen is a
parallel ext4_read_inode_bitmap can zero out the bitmap in between
the above ext4_set_bit_atomic and spin_lock(sb_bg_lock..)
The race results in below user visible errors
EXT4-fs error (device sdb1): ext4_free_inode: bit already cleared for inode 168449
EXT4-fs warning (device sdb1): ext4_unlink: Deleting nonexistent file ...
EXT4-fs warning (device sdb1): ext4_rmdir: empty directory has too many links ...
# ls -al /mnt/tmp/f/p369/d3/d6/d39/db2/dee/d10f/d3f/l71
ls: /mnt/tmp/f/p369/d3/d6/d39/db2/dee/d10f/d3f/l71: Stale NFS file handle
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@kernel.org
2009-01-06 05:38:14 +03:00
|
|
|
* and clear the uninit flag. The inode bitmap update
|
|
|
|
* and group desc uninit flag clear should be done
|
2009-05-03 04:35:09 +04:00
|
|
|
* after holding ext4_group_lock so that ext4_read_inode_bitmap
|
ext4: Fix the race between read_inode_bitmap() and ext4_new_inode()
We need to make sure we update the inode bitmap and clear
EXT4_BG_INODE_UNINIT flag with sb_bgl_lock held, since
ext4_read_inode_bitmap() looks at EXT4_BG_INODE_UNINIT to decide
whether to initialize the inode bitmap each time it is called.
(introduced by commit c806e68f.)
ext4_read_inode_bitmap does:
spin_lock(sb_bgl_lock(EXT4_SB(sb), block_group));
if (desc->bg_flags & cpu_to_le16(EXT4_BG_INODE_UNINIT)) {
ext4_init_inode_bitmap(sb, bh, block_group, desc);
and ext4_new_inode does
if (!ext4_set_bit_atomic(sb_bgl_lock(sbi, group),
ino, inode_bitmap_bh->b_data))
......
...
spin_lock(sb_bgl_lock(sbi, group));
gdp->bg_flags &= cpu_to_le16(~EXT4_BG_INODE_UNINIT);
i.e., on allocation we update the bitmap then we take the sb_bgl_lock
and clear the EXT4_BG_INODE_UNINIT flag. What can happen is a
parallel ext4_read_inode_bitmap can zero out the bitmap in between
the above ext4_set_bit_atomic and spin_lock(sb_bg_lock..)
The race results in below user visible errors
EXT4-fs error (device sdb1): ext4_free_inode: bit already cleared for inode 168449
EXT4-fs warning (device sdb1): ext4_unlink: Deleting nonexistent file ...
EXT4-fs warning (device sdb1): ext4_rmdir: empty directory has too many links ...
# ls -al /mnt/tmp/f/p369/d3/d6/d39/db2/dee/d10f/d3f/l71
ls: /mnt/tmp/f/p369/d3/d6/d39/db2/dee/d10f/d3f/l71: Stale NFS file handle
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@kernel.org
2009-01-06 05:38:14 +03:00
|
|
|
* doesn't race with the ext4_claim_inode
|
|
|
|
*/
|
|
|
|
static int ext4_claim_inode(struct super_block *sb,
|
|
|
|
struct buffer_head *inode_bitmap_bh,
|
|
|
|
unsigned long ino, ext4_group_t group, int mode)
|
|
|
|
{
|
|
|
|
int free = 0, retval = 0, count;
|
|
|
|
struct ext4_sb_info *sbi = EXT4_SB(sb);
|
|
|
|
struct ext4_group_desc *gdp = ext4_get_group_desc(sb, group, NULL);
|
|
|
|
|
2009-05-03 04:35:09 +04:00
|
|
|
ext4_lock_group(sb, group);
|
ext4: Fix the race between read_inode_bitmap() and ext4_new_inode()
We need to make sure we update the inode bitmap and clear
EXT4_BG_INODE_UNINIT flag with sb_bgl_lock held, since
ext4_read_inode_bitmap() looks at EXT4_BG_INODE_UNINIT to decide
whether to initialize the inode bitmap each time it is called.
(introduced by commit c806e68f.)
ext4_read_inode_bitmap does:
spin_lock(sb_bgl_lock(EXT4_SB(sb), block_group));
if (desc->bg_flags & cpu_to_le16(EXT4_BG_INODE_UNINIT)) {
ext4_init_inode_bitmap(sb, bh, block_group, desc);
and ext4_new_inode does
if (!ext4_set_bit_atomic(sb_bgl_lock(sbi, group),
ino, inode_bitmap_bh->b_data))
......
...
spin_lock(sb_bgl_lock(sbi, group));
gdp->bg_flags &= cpu_to_le16(~EXT4_BG_INODE_UNINIT);
i.e., on allocation we update the bitmap then we take the sb_bgl_lock
and clear the EXT4_BG_INODE_UNINIT flag. What can happen is a
parallel ext4_read_inode_bitmap can zero out the bitmap in between
the above ext4_set_bit_atomic and spin_lock(sb_bg_lock..)
The race results in below user visible errors
EXT4-fs error (device sdb1): ext4_free_inode: bit already cleared for inode 168449
EXT4-fs warning (device sdb1): ext4_unlink: Deleting nonexistent file ...
EXT4-fs warning (device sdb1): ext4_rmdir: empty directory has too many links ...
# ls -al /mnt/tmp/f/p369/d3/d6/d39/db2/dee/d10f/d3f/l71
ls: /mnt/tmp/f/p369/d3/d6/d39/db2/dee/d10f/d3f/l71: Stale NFS file handle
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@kernel.org
2009-01-06 05:38:14 +03:00
|
|
|
if (ext4_set_bit(ino, inode_bitmap_bh->b_data)) {
|
|
|
|
/* not a free inode */
|
|
|
|
retval = 1;
|
|
|
|
goto err_ret;
|
|
|
|
}
|
|
|
|
ino++;
|
|
|
|
if ((group == 0 && ino < EXT4_FIRST_INO(sb)) ||
|
|
|
|
ino > EXT4_INODES_PER_GROUP(sb)) {
|
2009-05-03 04:35:09 +04:00
|
|
|
ext4_unlock_group(sb, group);
|
2010-02-15 22:19:27 +03:00
|
|
|
ext4_error(sb, "reserved inode or inode > inodes count - "
|
ext4: Fix the race between read_inode_bitmap() and ext4_new_inode()
We need to make sure we update the inode bitmap and clear
EXT4_BG_INODE_UNINIT flag with sb_bgl_lock held, since
ext4_read_inode_bitmap() looks at EXT4_BG_INODE_UNINIT to decide
whether to initialize the inode bitmap each time it is called.
(introduced by commit c806e68f.)
ext4_read_inode_bitmap does:
spin_lock(sb_bgl_lock(EXT4_SB(sb), block_group));
if (desc->bg_flags & cpu_to_le16(EXT4_BG_INODE_UNINIT)) {
ext4_init_inode_bitmap(sb, bh, block_group, desc);
and ext4_new_inode does
if (!ext4_set_bit_atomic(sb_bgl_lock(sbi, group),
ino, inode_bitmap_bh->b_data))
......
...
spin_lock(sb_bgl_lock(sbi, group));
gdp->bg_flags &= cpu_to_le16(~EXT4_BG_INODE_UNINIT);
i.e., on allocation we update the bitmap then we take the sb_bgl_lock
and clear the EXT4_BG_INODE_UNINIT flag. What can happen is a
parallel ext4_read_inode_bitmap can zero out the bitmap in between
the above ext4_set_bit_atomic and spin_lock(sb_bg_lock..)
The race results in below user visible errors
EXT4-fs error (device sdb1): ext4_free_inode: bit already cleared for inode 168449
EXT4-fs warning (device sdb1): ext4_unlink: Deleting nonexistent file ...
EXT4-fs warning (device sdb1): ext4_rmdir: empty directory has too many links ...
# ls -al /mnt/tmp/f/p369/d3/d6/d39/db2/dee/d10f/d3f/l71
ls: /mnt/tmp/f/p369/d3/d6/d39/db2/dee/d10f/d3f/l71: Stale NFS file handle
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@kernel.org
2009-01-06 05:38:14 +03:00
|
|
|
"block_group = %u, inode=%lu", group,
|
|
|
|
ino + group * EXT4_INODES_PER_GROUP(sb));
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
/* If we didn't allocate from within the initialized part of the inode
|
|
|
|
* table then we need to initialize up to this inode. */
|
|
|
|
if (EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_GDT_CSUM)) {
|
|
|
|
|
|
|
|
if (gdp->bg_flags & cpu_to_le16(EXT4_BG_INODE_UNINIT)) {
|
|
|
|
gdp->bg_flags &= cpu_to_le16(~EXT4_BG_INODE_UNINIT);
|
|
|
|
/* When marking the block group with
|
|
|
|
* ~EXT4_BG_INODE_UNINIT we don't want to depend
|
|
|
|
* on the value of bg_itable_unused even though
|
|
|
|
* mke2fs could have initialized the same for us.
|
|
|
|
* Instead we calculated the value below
|
|
|
|
*/
|
|
|
|
|
|
|
|
free = 0;
|
|
|
|
} else {
|
|
|
|
free = EXT4_INODES_PER_GROUP(sb) -
|
|
|
|
ext4_itable_unused_count(sb, gdp);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check the relative inode number against the last used
|
|
|
|
* relative inode number in this group. if it is greater
|
|
|
|
* we need to update the bg_itable_unused count
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
if (ino > free)
|
|
|
|
ext4_itable_unused_set(sb, gdp,
|
|
|
|
(EXT4_INODES_PER_GROUP(sb) - ino));
|
|
|
|
}
|
|
|
|
count = ext4_free_inodes_count(sb, gdp) - 1;
|
|
|
|
ext4_free_inodes_set(sb, gdp, count);
|
|
|
|
if (S_ISDIR(mode)) {
|
|
|
|
count = ext4_used_dirs_count(sb, gdp) + 1;
|
|
|
|
ext4_used_dirs_set(sb, gdp, count);
|
2009-03-05 03:31:53 +03:00
|
|
|
if (sbi->s_log_groups_per_flex) {
|
|
|
|
ext4_group_t f = ext4_flex_group(sbi, group);
|
|
|
|
|
2010-03-24 04:32:00 +03:00
|
|
|
atomic_inc(&sbi->s_flex_groups[f].used_dirs);
|
2009-03-05 03:31:53 +03:00
|
|
|
}
|
ext4: Fix the race between read_inode_bitmap() and ext4_new_inode()
We need to make sure we update the inode bitmap and clear
EXT4_BG_INODE_UNINIT flag with sb_bgl_lock held, since
ext4_read_inode_bitmap() looks at EXT4_BG_INODE_UNINIT to decide
whether to initialize the inode bitmap each time it is called.
(introduced by commit c806e68f.)
ext4_read_inode_bitmap does:
spin_lock(sb_bgl_lock(EXT4_SB(sb), block_group));
if (desc->bg_flags & cpu_to_le16(EXT4_BG_INODE_UNINIT)) {
ext4_init_inode_bitmap(sb, bh, block_group, desc);
and ext4_new_inode does
if (!ext4_set_bit_atomic(sb_bgl_lock(sbi, group),
ino, inode_bitmap_bh->b_data))
......
...
spin_lock(sb_bgl_lock(sbi, group));
gdp->bg_flags &= cpu_to_le16(~EXT4_BG_INODE_UNINIT);
i.e., on allocation we update the bitmap then we take the sb_bgl_lock
and clear the EXT4_BG_INODE_UNINIT flag. What can happen is a
parallel ext4_read_inode_bitmap can zero out the bitmap in between
the above ext4_set_bit_atomic and spin_lock(sb_bg_lock..)
The race results in below user visible errors
EXT4-fs error (device sdb1): ext4_free_inode: bit already cleared for inode 168449
EXT4-fs warning (device sdb1): ext4_unlink: Deleting nonexistent file ...
EXT4-fs warning (device sdb1): ext4_rmdir: empty directory has too many links ...
# ls -al /mnt/tmp/f/p369/d3/d6/d39/db2/dee/d10f/d3f/l71
ls: /mnt/tmp/f/p369/d3/d6/d39/db2/dee/d10f/d3f/l71: Stale NFS file handle
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@kernel.org
2009-01-06 05:38:14 +03:00
|
|
|
}
|
|
|
|
gdp->bg_checksum = ext4_group_desc_csum(sbi, group, gdp);
|
|
|
|
err_ret:
|
2009-05-03 04:35:09 +04:00
|
|
|
ext4_unlock_group(sb, group);
|
ext4: Fix the race between read_inode_bitmap() and ext4_new_inode()
We need to make sure we update the inode bitmap and clear
EXT4_BG_INODE_UNINIT flag with sb_bgl_lock held, since
ext4_read_inode_bitmap() looks at EXT4_BG_INODE_UNINIT to decide
whether to initialize the inode bitmap each time it is called.
(introduced by commit c806e68f.)
ext4_read_inode_bitmap does:
spin_lock(sb_bgl_lock(EXT4_SB(sb), block_group));
if (desc->bg_flags & cpu_to_le16(EXT4_BG_INODE_UNINIT)) {
ext4_init_inode_bitmap(sb, bh, block_group, desc);
and ext4_new_inode does
if (!ext4_set_bit_atomic(sb_bgl_lock(sbi, group),
ino, inode_bitmap_bh->b_data))
......
...
spin_lock(sb_bgl_lock(sbi, group));
gdp->bg_flags &= cpu_to_le16(~EXT4_BG_INODE_UNINIT);
i.e., on allocation we update the bitmap then we take the sb_bgl_lock
and clear the EXT4_BG_INODE_UNINIT flag. What can happen is a
parallel ext4_read_inode_bitmap can zero out the bitmap in between
the above ext4_set_bit_atomic and spin_lock(sb_bg_lock..)
The race results in below user visible errors
EXT4-fs error (device sdb1): ext4_free_inode: bit already cleared for inode 168449
EXT4-fs warning (device sdb1): ext4_unlink: Deleting nonexistent file ...
EXT4-fs warning (device sdb1): ext4_rmdir: empty directory has too many links ...
# ls -al /mnt/tmp/f/p369/d3/d6/d39/db2/dee/d10f/d3f/l71
ls: /mnt/tmp/f/p369/d3/d6/d39/db2/dee/d10f/d3f/l71: Stale NFS file handle
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@kernel.org
2009-01-06 05:38:14 +03:00
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
2006-10-11 12:20:50 +04:00
|
|
|
/*
|
|
|
|
* 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.
|
|
|
|
*/
|
2009-06-13 19:09:42 +04:00
|
|
|
struct inode *ext4_new_inode(handle_t *handle, struct inode *dir, int mode,
|
2009-06-13 19:45:35 +04:00
|
|
|
const struct qstr *qstr, __u32 goal)
|
2006-10-11 12:20:50 +04:00
|
|
|
{
|
|
|
|
struct super_block *sb;
|
2009-01-04 06:33:39 +03:00
|
|
|
struct buffer_head *inode_bitmap_bh = NULL;
|
|
|
|
struct buffer_head *group_desc_bh;
|
2009-05-01 16:50:38 +04:00
|
|
|
ext4_group_t ngroups, group = 0;
|
2006-10-11 12:20:50 +04:00
|
|
|
unsigned long ino = 0;
|
2008-09-09 06:25:24 +04:00
|
|
|
struct inode *inode;
|
|
|
|
struct ext4_group_desc *gdp = NULL;
|
2006-10-11 12:20:53 +04:00
|
|
|
struct ext4_inode_info *ei;
|
|
|
|
struct ext4_sb_info *sbi;
|
ext4: Fix the race between read_inode_bitmap() and ext4_new_inode()
We need to make sure we update the inode bitmap and clear
EXT4_BG_INODE_UNINIT flag with sb_bgl_lock held, since
ext4_read_inode_bitmap() looks at EXT4_BG_INODE_UNINIT to decide
whether to initialize the inode bitmap each time it is called.
(introduced by commit c806e68f.)
ext4_read_inode_bitmap does:
spin_lock(sb_bgl_lock(EXT4_SB(sb), block_group));
if (desc->bg_flags & cpu_to_le16(EXT4_BG_INODE_UNINIT)) {
ext4_init_inode_bitmap(sb, bh, block_group, desc);
and ext4_new_inode does
if (!ext4_set_bit_atomic(sb_bgl_lock(sbi, group),
ino, inode_bitmap_bh->b_data))
......
...
spin_lock(sb_bgl_lock(sbi, group));
gdp->bg_flags &= cpu_to_le16(~EXT4_BG_INODE_UNINIT);
i.e., on allocation we update the bitmap then we take the sb_bgl_lock
and clear the EXT4_BG_INODE_UNINIT flag. What can happen is a
parallel ext4_read_inode_bitmap can zero out the bitmap in between
the above ext4_set_bit_atomic and spin_lock(sb_bg_lock..)
The race results in below user visible errors
EXT4-fs error (device sdb1): ext4_free_inode: bit already cleared for inode 168449
EXT4-fs warning (device sdb1): ext4_unlink: Deleting nonexistent file ...
EXT4-fs warning (device sdb1): ext4_rmdir: empty directory has too many links ...
# ls -al /mnt/tmp/f/p369/d3/d6/d39/db2/dee/d10f/d3f/l71
ls: /mnt/tmp/f/p369/d3/d6/d39/db2/dee/d10f/d3f/l71: Stale NFS file handle
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@kernel.org
2009-01-06 05:38:14 +03:00
|
|
|
int ret2, err = 0;
|
2006-10-11 12:20:50 +04:00
|
|
|
struct inode *ret;
|
2008-01-29 07:58:27 +03:00
|
|
|
ext4_group_t i;
|
|
|
|
int free = 0;
|
2009-03-12 19:20:01 +03:00
|
|
|
static int once = 1;
|
2008-07-12 03:27:31 +04:00
|
|
|
ext4_group_t flex_group;
|
2006-10-11 12:20:50 +04:00
|
|
|
|
|
|
|
/* Cannot create files in a deleted directory */
|
|
|
|
if (!dir || !dir->i_nlink)
|
|
|
|
return ERR_PTR(-EPERM);
|
|
|
|
|
|
|
|
sb = dir->i_sb;
|
2009-05-01 16:50:38 +04:00
|
|
|
ngroups = ext4_get_groups_count(sb);
|
2009-06-17 19:48:11 +04:00
|
|
|
trace_ext4_request_inode(dir, mode);
|
2006-10-11 12:20:50 +04:00
|
|
|
inode = new_inode(sb);
|
|
|
|
if (!inode)
|
|
|
|
return ERR_PTR(-ENOMEM);
|
2006-10-11 12:20:53 +04:00
|
|
|
ei = EXT4_I(inode);
|
|
|
|
sbi = EXT4_SB(sb);
|
2008-07-12 03:27:31 +04:00
|
|
|
|
2009-06-13 19:45:35 +04:00
|
|
|
if (!goal)
|
|
|
|
goal = sbi->s_inode_goal;
|
|
|
|
|
2009-07-06 07:45:11 +04:00
|
|
|
if (goal && goal <= le32_to_cpu(sbi->s_es->s_inodes_count)) {
|
2009-06-13 19:45:35 +04:00
|
|
|
group = (goal - 1) / EXT4_INODES_PER_GROUP(sb);
|
|
|
|
ino = (goal - 1) % EXT4_INODES_PER_GROUP(sb);
|
|
|
|
ret2 = 0;
|
|
|
|
goto got_group;
|
|
|
|
}
|
|
|
|
|
2009-03-12 19:18:34 +03:00
|
|
|
if (sbi->s_log_groups_per_flex && test_opt(sb, OLDALLOC)) {
|
2008-07-12 03:27:31 +04:00
|
|
|
ret2 = find_group_flex(sb, dir, &group);
|
2009-02-21 20:13:24 +03:00
|
|
|
if (ret2 == -1) {
|
2009-03-12 19:18:34 +03:00
|
|
|
ret2 = find_group_other(sb, dir, &group, mode);
|
2009-04-14 15:37:40 +04:00
|
|
|
if (ret2 == 0 && once) {
|
2009-03-12 19:20:01 +03:00
|
|
|
once = 0;
|
2009-02-21 20:13:24 +03:00
|
|
|
printk(KERN_NOTICE "ext4: find_group_flex "
|
|
|
|
"failed, fallback succeeded dir %lu\n",
|
|
|
|
dir->i_ino);
|
2009-04-14 15:37:40 +04:00
|
|
|
}
|
2009-02-21 20:13:24 +03:00
|
|
|
}
|
2008-07-12 03:27:31 +04:00
|
|
|
goto got_group;
|
|
|
|
}
|
|
|
|
|
2006-10-11 12:20:50 +04:00
|
|
|
if (S_ISDIR(mode)) {
|
2008-09-09 06:25:24 +04:00
|
|
|
if (test_opt(sb, OLDALLOC))
|
2008-01-29 07:58:27 +03:00
|
|
|
ret2 = find_group_dir(sb, dir, &group);
|
2006-10-11 12:20:50 +04:00
|
|
|
else
|
2009-06-13 19:09:42 +04:00
|
|
|
ret2 = find_group_orlov(sb, dir, &group, mode, qstr);
|
2006-10-11 12:20:50 +04:00
|
|
|
} else
|
2009-03-12 19:18:34 +03:00
|
|
|
ret2 = find_group_other(sb, dir, &group, mode);
|
2006-10-11 12:20:50 +04:00
|
|
|
|
2008-07-12 03:27:31 +04:00
|
|
|
got_group:
|
2009-03-12 19:18:34 +03:00
|
|
|
EXT4_I(dir)->i_last_alloc_group = group;
|
2006-10-11 12:20:50 +04:00
|
|
|
err = -ENOSPC;
|
2008-01-29 07:58:27 +03:00
|
|
|
if (ret2 == -1)
|
2006-10-11 12:20:50 +04:00
|
|
|
goto out;
|
|
|
|
|
2009-06-13 19:45:35 +04:00
|
|
|
for (i = 0; i < ngroups; i++, ino = 0) {
|
2006-10-11 12:20:50 +04:00
|
|
|
err = -EIO;
|
|
|
|
|
2009-01-04 06:33:39 +03:00
|
|
|
gdp = ext4_get_group_desc(sb, group, &group_desc_bh);
|
2006-10-11 12:20:50 +04:00
|
|
|
if (!gdp)
|
|
|
|
goto fail;
|
|
|
|
|
2009-01-04 06:33:39 +03:00
|
|
|
brelse(inode_bitmap_bh);
|
|
|
|
inode_bitmap_bh = ext4_read_inode_bitmap(sb, group);
|
|
|
|
if (!inode_bitmap_bh)
|
2006-10-11 12:20:50 +04:00
|
|
|
goto fail;
|
|
|
|
|
|
|
|
repeat_in_this_group:
|
2006-10-11 12:20:53 +04:00
|
|
|
ino = ext4_find_next_zero_bit((unsigned long *)
|
2009-01-04 06:33:39 +03:00
|
|
|
inode_bitmap_bh->b_data,
|
|
|
|
EXT4_INODES_PER_GROUP(sb), ino);
|
|
|
|
|
2006-10-11 12:20:53 +04:00
|
|
|
if (ino < EXT4_INODES_PER_GROUP(sb)) {
|
2006-10-11 12:20:50 +04:00
|
|
|
|
2009-01-04 06:33:39 +03:00
|
|
|
BUFFER_TRACE(inode_bitmap_bh, "get_write_access");
|
|
|
|
err = ext4_journal_get_write_access(handle,
|
|
|
|
inode_bitmap_bh);
|
2006-10-11 12:20:50 +04:00
|
|
|
if (err)
|
|
|
|
goto fail;
|
|
|
|
|
ext4: Fix the race between read_inode_bitmap() and ext4_new_inode()
We need to make sure we update the inode bitmap and clear
EXT4_BG_INODE_UNINIT flag with sb_bgl_lock held, since
ext4_read_inode_bitmap() looks at EXT4_BG_INODE_UNINIT to decide
whether to initialize the inode bitmap each time it is called.
(introduced by commit c806e68f.)
ext4_read_inode_bitmap does:
spin_lock(sb_bgl_lock(EXT4_SB(sb), block_group));
if (desc->bg_flags & cpu_to_le16(EXT4_BG_INODE_UNINIT)) {
ext4_init_inode_bitmap(sb, bh, block_group, desc);
and ext4_new_inode does
if (!ext4_set_bit_atomic(sb_bgl_lock(sbi, group),
ino, inode_bitmap_bh->b_data))
......
...
spin_lock(sb_bgl_lock(sbi, group));
gdp->bg_flags &= cpu_to_le16(~EXT4_BG_INODE_UNINIT);
i.e., on allocation we update the bitmap then we take the sb_bgl_lock
and clear the EXT4_BG_INODE_UNINIT flag. What can happen is a
parallel ext4_read_inode_bitmap can zero out the bitmap in between
the above ext4_set_bit_atomic and spin_lock(sb_bg_lock..)
The race results in below user visible errors
EXT4-fs error (device sdb1): ext4_free_inode: bit already cleared for inode 168449
EXT4-fs warning (device sdb1): ext4_unlink: Deleting nonexistent file ...
EXT4-fs warning (device sdb1): ext4_rmdir: empty directory has too many links ...
# ls -al /mnt/tmp/f/p369/d3/d6/d39/db2/dee/d10f/d3f/l71
ls: /mnt/tmp/f/p369/d3/d6/d39/db2/dee/d10f/d3f/l71: Stale NFS file handle
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@kernel.org
2009-01-06 05:38:14 +03:00
|
|
|
BUFFER_TRACE(group_desc_bh, "get_write_access");
|
|
|
|
err = ext4_journal_get_write_access(handle,
|
|
|
|
group_desc_bh);
|
|
|
|
if (err)
|
|
|
|
goto fail;
|
|
|
|
if (!ext4_claim_inode(sb, inode_bitmap_bh,
|
|
|
|
ino, group, mode)) {
|
2006-10-11 12:20:50 +04:00
|
|
|
/* we won it */
|
2009-01-04 06:33:39 +03:00
|
|
|
BUFFER_TRACE(inode_bitmap_bh,
|
2009-01-07 08:06:22 +03:00
|
|
|
"call ext4_handle_dirty_metadata");
|
|
|
|
err = ext4_handle_dirty_metadata(handle,
|
2010-02-16 23:06:29 +03:00
|
|
|
NULL,
|
2009-01-04 06:33:39 +03:00
|
|
|
inode_bitmap_bh);
|
2006-10-11 12:20:50 +04:00
|
|
|
if (err)
|
|
|
|
goto fail;
|
ext4: Fix the race between read_inode_bitmap() and ext4_new_inode()
We need to make sure we update the inode bitmap and clear
EXT4_BG_INODE_UNINIT flag with sb_bgl_lock held, since
ext4_read_inode_bitmap() looks at EXT4_BG_INODE_UNINIT to decide
whether to initialize the inode bitmap each time it is called.
(introduced by commit c806e68f.)
ext4_read_inode_bitmap does:
spin_lock(sb_bgl_lock(EXT4_SB(sb), block_group));
if (desc->bg_flags & cpu_to_le16(EXT4_BG_INODE_UNINIT)) {
ext4_init_inode_bitmap(sb, bh, block_group, desc);
and ext4_new_inode does
if (!ext4_set_bit_atomic(sb_bgl_lock(sbi, group),
ino, inode_bitmap_bh->b_data))
......
...
spin_lock(sb_bgl_lock(sbi, group));
gdp->bg_flags &= cpu_to_le16(~EXT4_BG_INODE_UNINIT);
i.e., on allocation we update the bitmap then we take the sb_bgl_lock
and clear the EXT4_BG_INODE_UNINIT flag. What can happen is a
parallel ext4_read_inode_bitmap can zero out the bitmap in between
the above ext4_set_bit_atomic and spin_lock(sb_bg_lock..)
The race results in below user visible errors
EXT4-fs error (device sdb1): ext4_free_inode: bit already cleared for inode 168449
EXT4-fs warning (device sdb1): ext4_unlink: Deleting nonexistent file ...
EXT4-fs warning (device sdb1): ext4_rmdir: empty directory has too many links ...
# ls -al /mnt/tmp/f/p369/d3/d6/d39/db2/dee/d10f/d3f/l71
ls: /mnt/tmp/f/p369/d3/d6/d39/db2/dee/d10f/d3f/l71: Stale NFS file handle
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@kernel.org
2009-01-06 05:38:14 +03:00
|
|
|
/* zero bit is inode number 1*/
|
|
|
|
ino++;
|
2006-10-11 12:20:50 +04:00
|
|
|
goto got;
|
|
|
|
}
|
|
|
|
/* we lost it */
|
2009-01-04 06:33:39 +03:00
|
|
|
ext4_handle_release_buffer(handle, inode_bitmap_bh);
|
ext4: Fix the race between read_inode_bitmap() and ext4_new_inode()
We need to make sure we update the inode bitmap and clear
EXT4_BG_INODE_UNINIT flag with sb_bgl_lock held, since
ext4_read_inode_bitmap() looks at EXT4_BG_INODE_UNINIT to decide
whether to initialize the inode bitmap each time it is called.
(introduced by commit c806e68f.)
ext4_read_inode_bitmap does:
spin_lock(sb_bgl_lock(EXT4_SB(sb), block_group));
if (desc->bg_flags & cpu_to_le16(EXT4_BG_INODE_UNINIT)) {
ext4_init_inode_bitmap(sb, bh, block_group, desc);
and ext4_new_inode does
if (!ext4_set_bit_atomic(sb_bgl_lock(sbi, group),
ino, inode_bitmap_bh->b_data))
......
...
spin_lock(sb_bgl_lock(sbi, group));
gdp->bg_flags &= cpu_to_le16(~EXT4_BG_INODE_UNINIT);
i.e., on allocation we update the bitmap then we take the sb_bgl_lock
and clear the EXT4_BG_INODE_UNINIT flag. What can happen is a
parallel ext4_read_inode_bitmap can zero out the bitmap in between
the above ext4_set_bit_atomic and spin_lock(sb_bg_lock..)
The race results in below user visible errors
EXT4-fs error (device sdb1): ext4_free_inode: bit already cleared for inode 168449
EXT4-fs warning (device sdb1): ext4_unlink: Deleting nonexistent file ...
EXT4-fs warning (device sdb1): ext4_rmdir: empty directory has too many links ...
# ls -al /mnt/tmp/f/p369/d3/d6/d39/db2/dee/d10f/d3f/l71
ls: /mnt/tmp/f/p369/d3/d6/d39/db2/dee/d10f/d3f/l71: Stale NFS file handle
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@kernel.org
2009-01-06 05:38:14 +03:00
|
|
|
ext4_handle_release_buffer(handle, group_desc_bh);
|
2006-10-11 12:20:50 +04:00
|
|
|
|
2006-10-11 12:20:53 +04:00
|
|
|
if (++ino < EXT4_INODES_PER_GROUP(sb))
|
2006-10-11 12:20:50 +04:00
|
|
|
goto repeat_in_this_group;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This case is possible in concurrent environment. It is very
|
|
|
|
* rare. We cannot repeat the find_group_xxx() call because
|
|
|
|
* that will simply return the same blockgroup, because the
|
|
|
|
* group descriptor metadata has not yet been updated.
|
|
|
|
* So we just go onto the next blockgroup.
|
|
|
|
*/
|
2009-05-01 16:50:38 +04:00
|
|
|
if (++group == ngroups)
|
2006-10-11 12:20:50 +04:00
|
|
|
group = 0;
|
|
|
|
}
|
|
|
|
err = -ENOSPC;
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
got:
|
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-17 02:38:25 +04:00
|
|
|
/* We may have to initialize the block bitmap if it isn't already */
|
|
|
|
if (EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_GDT_CSUM) &&
|
|
|
|
gdp->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT)) {
|
2009-01-04 06:33:39 +03:00
|
|
|
struct buffer_head *block_bitmap_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-17 02:38:25 +04:00
|
|
|
|
2009-01-04 06:33:39 +03:00
|
|
|
block_bitmap_bh = ext4_read_block_bitmap(sb, group);
|
|
|
|
BUFFER_TRACE(block_bitmap_bh, "get block bitmap access");
|
|
|
|
err = ext4_journal_get_write_access(handle, block_bitmap_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-17 02:38:25 +04:00
|
|
|
if (err) {
|
2009-01-04 06:33:39 +03:00
|
|
|
brelse(block_bitmap_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-17 02:38:25 +04:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
free = 0;
|
2009-05-03 04:35:09 +04:00
|
|
|
ext4_lock_group(sb, 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-17 02:38:25 +04:00
|
|
|
/* recheck and clear flag under lock if we still need to */
|
|
|
|
if (gdp->bg_flags & cpu_to_le16(EXT4_BG_BLOCK_UNINIT)) {
|
|
|
|
free = ext4_free_blocks_after_init(sb, group, gdp);
|
2009-01-04 06:33:39 +03:00
|
|
|
gdp->bg_flags &= cpu_to_le16(~EXT4_BG_BLOCK_UNINIT);
|
2009-01-06 06:20:24 +03:00
|
|
|
ext4_free_blks_set(sb, gdp, free);
|
2008-11-07 17:21:01 +03:00
|
|
|
gdp->bg_checksum = ext4_group_desc_csum(sbi, group,
|
|
|
|
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-17 02:38:25 +04:00
|
|
|
}
|
2009-05-03 04:35:09 +04:00
|
|
|
ext4_unlock_group(sb, 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-17 02:38:25 +04:00
|
|
|
|
|
|
|
/* Don't need to dirty bitmap block if we didn't change it */
|
|
|
|
if (free) {
|
2009-01-04 06:33:39 +03:00
|
|
|
BUFFER_TRACE(block_bitmap_bh, "dirty block bitmap");
|
2009-01-07 08:06:22 +03:00
|
|
|
err = ext4_handle_dirty_metadata(handle,
|
2009-01-04 06:33:39 +03:00
|
|
|
NULL, block_bitmap_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-17 02:38:25 +04:00
|
|
|
}
|
|
|
|
|
2009-01-04 06:33:39 +03:00
|
|
|
brelse(block_bitmap_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-17 02:38:25 +04:00
|
|
|
if (err)
|
|
|
|
goto fail;
|
|
|
|
}
|
2009-01-04 06:33:39 +03:00
|
|
|
BUFFER_TRACE(group_desc_bh, "call ext4_handle_dirty_metadata");
|
|
|
|
err = ext4_handle_dirty_metadata(handle, NULL, group_desc_bh);
|
ext4: Fix the race between read_inode_bitmap() and ext4_new_inode()
We need to make sure we update the inode bitmap and clear
EXT4_BG_INODE_UNINIT flag with sb_bgl_lock held, since
ext4_read_inode_bitmap() looks at EXT4_BG_INODE_UNINIT to decide
whether to initialize the inode bitmap each time it is called.
(introduced by commit c806e68f.)
ext4_read_inode_bitmap does:
spin_lock(sb_bgl_lock(EXT4_SB(sb), block_group));
if (desc->bg_flags & cpu_to_le16(EXT4_BG_INODE_UNINIT)) {
ext4_init_inode_bitmap(sb, bh, block_group, desc);
and ext4_new_inode does
if (!ext4_set_bit_atomic(sb_bgl_lock(sbi, group),
ino, inode_bitmap_bh->b_data))
......
...
spin_lock(sb_bgl_lock(sbi, group));
gdp->bg_flags &= cpu_to_le16(~EXT4_BG_INODE_UNINIT);
i.e., on allocation we update the bitmap then we take the sb_bgl_lock
and clear the EXT4_BG_INODE_UNINIT flag. What can happen is a
parallel ext4_read_inode_bitmap can zero out the bitmap in between
the above ext4_set_bit_atomic and spin_lock(sb_bg_lock..)
The race results in below user visible errors
EXT4-fs error (device sdb1): ext4_free_inode: bit already cleared for inode 168449
EXT4-fs warning (device sdb1): ext4_unlink: Deleting nonexistent file ...
EXT4-fs warning (device sdb1): ext4_rmdir: empty directory has too many links ...
# ls -al /mnt/tmp/f/p369/d3/d6/d39/db2/dee/d10f/d3f/l71
ls: /mnt/tmp/f/p369/d3/d6/d39/db2/dee/d10f/d3f/l71: Stale NFS file handle
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@kernel.org
2009-01-06 05:38:14 +03:00
|
|
|
if (err)
|
|
|
|
goto fail;
|
2006-10-11 12:20:50 +04:00
|
|
|
|
|
|
|
percpu_counter_dec(&sbi->s_freeinodes_counter);
|
|
|
|
if (S_ISDIR(mode))
|
|
|
|
percpu_counter_inc(&sbi->s_dirs_counter);
|
2010-06-12 07:14:04 +04:00
|
|
|
ext4_mark_super_dirty(sb);
|
2006-10-11 12:20:50 +04:00
|
|
|
|
2008-07-12 03:27:31 +04:00
|
|
|
if (sbi->s_log_groups_per_flex) {
|
|
|
|
flex_group = ext4_flex_group(sbi, group);
|
2009-03-05 03:09:10 +03:00
|
|
|
atomic_dec(&sbi->s_flex_groups[flex_group].free_inodes);
|
2008-07-12 03:27:31 +04:00
|
|
|
}
|
|
|
|
|
2010-03-04 17:31:51 +03:00
|
|
|
if (test_opt(sb, GRPID)) {
|
|
|
|
inode->i_mode = mode;
|
|
|
|
inode->i_uid = current_fsuid();
|
2006-10-11 12:20:50 +04:00
|
|
|
inode->i_gid = dir->i_gid;
|
|
|
|
} else
|
2010-03-04 17:31:51 +03:00
|
|
|
inode_init_owner(inode, dir, mode);
|
2006-10-11 12:20:50 +04: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-17 02:38:25 +04:00
|
|
|
inode->i_ino = ino + group * EXT4_INODES_PER_GROUP(sb);
|
2006-10-11 12:20:50 +04:00
|
|
|
/* This is the optimal IO size (for stat), not the fs block size */
|
|
|
|
inode->i_blocks = 0;
|
2007-07-18 17:15:20 +04:00
|
|
|
inode->i_mtime = inode->i_atime = inode->i_ctime = ei->i_crtime =
|
|
|
|
ext4_current_time(inode);
|
2006-10-11 12:20:50 +04:00
|
|
|
|
|
|
|
memset(ei->i_data, 0, sizeof(ei->i_data));
|
|
|
|
ei->i_dir_start_lookup = 0;
|
|
|
|
ei->i_disksize = 0;
|
|
|
|
|
2008-02-26 00:38:03 +03:00
|
|
|
/*
|
2009-02-16 02:09:20 +03:00
|
|
|
* Don't inherit extent flag from directory, amongst others. We set
|
|
|
|
* extent flag on newly created directory and file only if -o extent
|
|
|
|
* mount option is specified
|
2008-02-26 00:38:03 +03:00
|
|
|
*/
|
2009-02-16 02:09:20 +03:00
|
|
|
ei->i_flags =
|
|
|
|
ext4_mask_flags(mode, EXT4_I(dir)->i_flags & EXT4_FL_INHERITED);
|
2006-10-11 12:20:50 +04:00
|
|
|
ei->i_file_acl = 0;
|
|
|
|
ei->i_dtime = 0;
|
|
|
|
ei->i_block_group = group;
|
2009-03-12 19:18:34 +03:00
|
|
|
ei->i_last_alloc_group = ~0;
|
2006-10-11 12:20:50 +04:00
|
|
|
|
2006-10-11 12:20:53 +04:00
|
|
|
ext4_set_inode_flags(inode);
|
2006-10-11 12:20:50 +04:00
|
|
|
if (IS_DIRSYNC(inode))
|
2009-01-07 08:06:22 +03:00
|
|
|
ext4_handle_sync(handle);
|
2008-12-30 10:03:31 +03:00
|
|
|
if (insert_inode_locked(inode) < 0) {
|
|
|
|
err = -EINVAL;
|
|
|
|
goto fail_drop;
|
|
|
|
}
|
2006-10-11 12:20:50 +04:00
|
|
|
spin_lock(&sbi->s_next_gen_lock);
|
|
|
|
inode->i_generation = sbi->s_next_generation++;
|
|
|
|
spin_unlock(&sbi->s_next_gen_lock);
|
|
|
|
|
2010-01-24 22:34:07 +03:00
|
|
|
ei->i_state_flags = 0;
|
|
|
|
ext4_set_inode_state(inode, EXT4_STATE_NEW);
|
2007-07-18 17:15:20 +04:00
|
|
|
|
|
|
|
ei->i_extra_isize = EXT4_SB(sb)->s_want_extra_isize;
|
2006-10-11 12:20:50 +04:00
|
|
|
|
|
|
|
ret = inode;
|
2010-03-03 17:05:07 +03:00
|
|
|
dquot_initialize(inode);
|
2010-03-03 17:05:01 +03:00
|
|
|
err = dquot_alloc_inode(inode);
|
|
|
|
if (err)
|
2006-10-11 12:20:50 +04:00
|
|
|
goto fail_drop;
|
|
|
|
|
2006-10-11 12:20:53 +04:00
|
|
|
err = ext4_init_acl(handle, inode, dir);
|
2006-10-11 12:20:50 +04:00
|
|
|
if (err)
|
|
|
|
goto fail_free_drop;
|
|
|
|
|
2008-09-09 06:25:24 +04:00
|
|
|
err = ext4_init_security(handle, inode, dir);
|
2006-10-11 12:20:50 +04:00
|
|
|
if (err)
|
|
|
|
goto fail_free_drop;
|
|
|
|
|
2009-01-06 22:53:16 +03:00
|
|
|
if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_EXTENTS)) {
|
2008-07-12 03:27:31 +04:00
|
|
|
/* set extent flag only for directory, file and normal symlink*/
|
2008-04-29 16:11:12 +04:00
|
|
|
if (S_ISDIR(mode) || S_ISREG(mode) || S_ISLNK(mode)) {
|
2010-05-17 06:00:00 +04:00
|
|
|
ext4_set_inode_flag(inode, EXT4_INODE_EXTENTS);
|
2008-02-26 00:38:03 +03:00
|
|
|
ext4_ext_tree_init(handle, inode);
|
|
|
|
}
|
2006-10-11 12:21:03 +04:00
|
|
|
}
|
2006-10-11 12:20:50 +04:00
|
|
|
|
2008-04-30 06:00:36 +04:00
|
|
|
err = ext4_mark_inode_dirty(handle, inode);
|
|
|
|
if (err) {
|
|
|
|
ext4_std_error(sb, err);
|
|
|
|
goto fail_free_drop;
|
|
|
|
}
|
|
|
|
|
2006-10-11 12:20:53 +04:00
|
|
|
ext4_debug("allocating inode %lu\n", inode->i_ino);
|
2009-06-17 19:48:11 +04:00
|
|
|
trace_ext4_allocate_inode(inode, dir, mode);
|
2006-10-11 12:20:50 +04:00
|
|
|
goto really_out;
|
|
|
|
fail:
|
2006-10-11 12:20:53 +04:00
|
|
|
ext4_std_error(sb, err);
|
2006-10-11 12:20:50 +04:00
|
|
|
out:
|
|
|
|
iput(inode);
|
|
|
|
ret = ERR_PTR(err);
|
|
|
|
really_out:
|
2009-01-04 06:33:39 +03:00
|
|
|
brelse(inode_bitmap_bh);
|
2006-10-11 12:20:50 +04:00
|
|
|
return ret;
|
|
|
|
|
|
|
|
fail_free_drop:
|
2010-03-03 17:05:01 +03:00
|
|
|
dquot_free_inode(inode);
|
2006-10-11 12:20:50 +04:00
|
|
|
|
|
|
|
fail_drop:
|
2010-03-03 17:05:05 +03:00
|
|
|
dquot_drop(inode);
|
2006-10-11 12:20:50 +04:00
|
|
|
inode->i_flags |= S_NOQUOTA;
|
|
|
|
inode->i_nlink = 0;
|
2008-12-30 10:03:31 +03:00
|
|
|
unlock_new_inode(inode);
|
2006-10-11 12:20:50 +04:00
|
|
|
iput(inode);
|
2009-01-04 06:33:39 +03:00
|
|
|
brelse(inode_bitmap_bh);
|
2006-10-11 12:20:50 +04:00
|
|
|
return ERR_PTR(err);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Verify that we are loading a valid orphan from disk */
|
2006-10-11 12:20:53 +04:00
|
|
|
struct inode *ext4_orphan_get(struct super_block *sb, unsigned long ino)
|
2006-10-11 12:20:50 +04:00
|
|
|
{
|
2006-10-11 12:20:53 +04:00
|
|
|
unsigned long max_ino = le32_to_cpu(EXT4_SB(sb)->s_es->s_inodes_count);
|
2008-01-29 07:58:27 +03:00
|
|
|
ext4_group_t block_group;
|
2006-10-11 12:20:50 +04:00
|
|
|
int bit;
|
2008-02-07 11:15:37 +03:00
|
|
|
struct buffer_head *bitmap_bh;
|
2006-10-11 12:20:50 +04:00
|
|
|
struct inode *inode = NULL;
|
2008-02-07 11:15:37 +03:00
|
|
|
long err = -EIO;
|
2006-10-11 12:20:50 +04:00
|
|
|
|
|
|
|
/* Error cases - e2fsck has already cleaned up for us */
|
|
|
|
if (ino > max_ino) {
|
2010-02-15 22:19:27 +03:00
|
|
|
ext4_warning(sb, "bad orphan ino %lu! e2fsck was run?", ino);
|
2008-02-07 11:15:37 +03:00
|
|
|
goto error;
|
2006-10-11 12:20:50 +04:00
|
|
|
}
|
|
|
|
|
2006-10-11 12:20:53 +04:00
|
|
|
block_group = (ino - 1) / EXT4_INODES_PER_GROUP(sb);
|
|
|
|
bit = (ino - 1) % EXT4_INODES_PER_GROUP(sb);
|
2008-08-03 05:21:02 +04:00
|
|
|
bitmap_bh = ext4_read_inode_bitmap(sb, block_group);
|
2006-10-11 12:20:50 +04:00
|
|
|
if (!bitmap_bh) {
|
2010-02-15 22:19:27 +03:00
|
|
|
ext4_warning(sb, "inode bitmap error for orphan %lu", ino);
|
2008-02-07 11:15:37 +03:00
|
|
|
goto error;
|
2006-10-11 12:20:50 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Having the inode bit set should be a 100% indicator that this
|
|
|
|
* is a valid orphan (no e2fsck run on fs). Orphans also include
|
|
|
|
* inodes that were being truncated, so we can't check i_nlink==0.
|
|
|
|
*/
|
2008-02-07 11:15:37 +03:00
|
|
|
if (!ext4_test_bit(bit, bitmap_bh->b_data))
|
|
|
|
goto bad_orphan;
|
|
|
|
|
|
|
|
inode = ext4_iget(sb, ino);
|
|
|
|
if (IS_ERR(inode))
|
|
|
|
goto iget_failed;
|
|
|
|
|
2008-07-12 03:27:31 +04:00
|
|
|
/*
|
|
|
|
* If the orphans has i_nlinks > 0 then it should be able to be
|
|
|
|
* truncated, otherwise it won't be removed from the orphan list
|
|
|
|
* during processing and an infinite loop will result.
|
|
|
|
*/
|
|
|
|
if (inode->i_nlink && !ext4_can_truncate(inode))
|
|
|
|
goto bad_orphan;
|
|
|
|
|
2008-02-07 11:15:37 +03:00
|
|
|
if (NEXT_ORPHAN(inode) > max_ino)
|
|
|
|
goto bad_orphan;
|
|
|
|
brelse(bitmap_bh);
|
|
|
|
return inode;
|
|
|
|
|
|
|
|
iget_failed:
|
|
|
|
err = PTR_ERR(inode);
|
|
|
|
inode = NULL;
|
|
|
|
bad_orphan:
|
2010-02-15 22:19:27 +03:00
|
|
|
ext4_warning(sb, "bad orphan inode %lu! e2fsck was run?", ino);
|
2008-02-07 11:15:37 +03:00
|
|
|
printk(KERN_NOTICE "ext4_test_bit(bit=%d, block=%llu) = %d\n",
|
|
|
|
bit, (unsigned long long)bitmap_bh->b_blocknr,
|
|
|
|
ext4_test_bit(bit, bitmap_bh->b_data));
|
|
|
|
printk(KERN_NOTICE "inode=%p\n", inode);
|
|
|
|
if (inode) {
|
|
|
|
printk(KERN_NOTICE "is_bad_inode(inode)=%d\n",
|
|
|
|
is_bad_inode(inode));
|
|
|
|
printk(KERN_NOTICE "NEXT_ORPHAN(inode)=%u\n",
|
|
|
|
NEXT_ORPHAN(inode));
|
|
|
|
printk(KERN_NOTICE "max_ino=%lu\n", max_ino);
|
2008-07-12 03:27:31 +04:00
|
|
|
printk(KERN_NOTICE "i_nlink=%u\n", inode->i_nlink);
|
2006-10-11 12:20:50 +04:00
|
|
|
/* Avoid freeing blocks if we got a bad deleted inode */
|
2008-02-07 11:15:37 +03:00
|
|
|
if (inode->i_nlink == 0)
|
2006-10-11 12:20:50 +04:00
|
|
|
inode->i_blocks = 0;
|
|
|
|
iput(inode);
|
|
|
|
}
|
|
|
|
brelse(bitmap_bh);
|
2008-02-07 11:15:37 +03:00
|
|
|
error:
|
|
|
|
return ERR_PTR(err);
|
2006-10-11 12:20:50 +04:00
|
|
|
}
|
|
|
|
|
2008-09-09 06:25:24 +04:00
|
|
|
unsigned long ext4_count_free_inodes(struct super_block *sb)
|
2006-10-11 12:20:50 +04:00
|
|
|
{
|
|
|
|
unsigned long desc_count;
|
2006-10-11 12:20:53 +04:00
|
|
|
struct ext4_group_desc *gdp;
|
2009-05-01 16:50:38 +04:00
|
|
|
ext4_group_t i, ngroups = ext4_get_groups_count(sb);
|
2006-10-11 12:20:53 +04:00
|
|
|
#ifdef EXT4FS_DEBUG
|
|
|
|
struct ext4_super_block *es;
|
2006-10-11 12:20:50 +04:00
|
|
|
unsigned long bitmap_count, x;
|
|
|
|
struct buffer_head *bitmap_bh = NULL;
|
|
|
|
|
2006-10-11 12:20:53 +04:00
|
|
|
es = EXT4_SB(sb)->s_es;
|
2006-10-11 12:20:50 +04:00
|
|
|
desc_count = 0;
|
|
|
|
bitmap_count = 0;
|
|
|
|
gdp = NULL;
|
2009-05-01 16:50:38 +04:00
|
|
|
for (i = 0; i < ngroups; i++) {
|
2008-09-09 06:25:24 +04:00
|
|
|
gdp = ext4_get_group_desc(sb, i, NULL);
|
2006-10-11 12:20:50 +04:00
|
|
|
if (!gdp)
|
|
|
|
continue;
|
2009-01-06 06:20:24 +03:00
|
|
|
desc_count += ext4_free_inodes_count(sb, gdp);
|
2006-10-11 12:20:50 +04:00
|
|
|
brelse(bitmap_bh);
|
2008-08-03 05:21:02 +04:00
|
|
|
bitmap_bh = ext4_read_inode_bitmap(sb, i);
|
2006-10-11 12:20:50 +04:00
|
|
|
if (!bitmap_bh)
|
|
|
|
continue;
|
|
|
|
|
2006-10-11 12:20:53 +04:00
|
|
|
x = ext4_count_free(bitmap_bh, EXT4_INODES_PER_GROUP(sb) / 8);
|
2008-01-29 07:58:27 +03:00
|
|
|
printk(KERN_DEBUG "group %lu: stored = %d, counted = %lu\n",
|
2009-07-28 05:44:40 +04:00
|
|
|
(unsigned long) i, ext4_free_inodes_count(sb, gdp), x);
|
2006-10-11 12:20:50 +04:00
|
|
|
bitmap_count += x;
|
|
|
|
}
|
|
|
|
brelse(bitmap_bh);
|
2008-09-09 07:00:52 +04:00
|
|
|
printk(KERN_DEBUG "ext4_count_free_inodes: "
|
|
|
|
"stored = %u, computed = %lu, %lu\n",
|
|
|
|
le32_to_cpu(es->s_free_inodes_count), desc_count, bitmap_count);
|
2006-10-11 12:20:50 +04:00
|
|
|
return desc_count;
|
|
|
|
#else
|
|
|
|
desc_count = 0;
|
2009-05-01 16:50:38 +04:00
|
|
|
for (i = 0; i < ngroups; i++) {
|
2008-09-09 06:25:24 +04:00
|
|
|
gdp = ext4_get_group_desc(sb, i, NULL);
|
2006-10-11 12:20:50 +04:00
|
|
|
if (!gdp)
|
|
|
|
continue;
|
2009-01-06 06:20:24 +03:00
|
|
|
desc_count += ext4_free_inodes_count(sb, gdp);
|
2006-10-11 12:20:50 +04:00
|
|
|
cond_resched();
|
|
|
|
}
|
|
|
|
return desc_count;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Called at mount-time, super-block is locked */
|
2008-09-09 06:25:24 +04:00
|
|
|
unsigned long ext4_count_dirs(struct super_block * sb)
|
2006-10-11 12:20:50 +04:00
|
|
|
{
|
|
|
|
unsigned long count = 0;
|
2009-05-01 16:50:38 +04:00
|
|
|
ext4_group_t i, ngroups = ext4_get_groups_count(sb);
|
2006-10-11 12:20:50 +04:00
|
|
|
|
2009-05-01 16:50:38 +04:00
|
|
|
for (i = 0; i < ngroups; i++) {
|
2008-09-09 06:25:24 +04:00
|
|
|
struct ext4_group_desc *gdp = ext4_get_group_desc(sb, i, NULL);
|
2006-10-11 12:20:50 +04:00
|
|
|
if (!gdp)
|
|
|
|
continue;
|
2009-01-06 06:20:24 +03:00
|
|
|
count += ext4_used_dirs_count(sb, gdp);
|
2006-10-11 12:20:50 +04:00
|
|
|
}
|
|
|
|
return count;
|
|
|
|
}
|