diff options
| author | Li Dongyang <dongyangli@ddn.com> | 2023-07-20 22:50:12 +1000 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2024-02-08 10:51:46 -0500 |
| commit | 196cd1224ccaf5ca76540fc0a6238695d4476ca9 (patch) | |
| tree | 725a79efce02a4ab17595ec6db61917d9f3f53ac | |
| parent | 633ab26eefe1b037eaba82d9a3555eb712c82345 (diff) | |
| download | e2fsprogs-196cd1224ccaf5ca76540fc0a6238695d4476ca9.tar.gz | |
ext2fs: make sure we have at least EXT2_FIRST_INO + 1 inodes
When creating a small fs with 100 1k blocks, mke2fs fails with:
Creating filesystem with 100 1k blocks and 8 inodes
Allocating group tables: done
Writing inode tables: done
ext2fs_mkdir: Could not allocate inode in ext2 filesystem while creating /lost+found
Increase s_inodes_per_group with a step of 8 to make
sure we have at least EXT2_FIRST_INO + 1 inodes.
Change-Id: Ib885735641dfa0ed9c6f6a4a1f9afec291673126
Signed-off-by: Li Dongyang <dongyangli@ddn.com>
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
Link: https://lore.kernel.org/r/20230720125012.641504-1-dongyangli@ddn.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rw-r--r-- | lib/ext2fs/initialize.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/ext2fs/initialize.c b/lib/ext2fs/initialize.c index edd692bb9..e96f3cabd 100644 --- a/lib/ext2fs/initialize.c +++ b/lib/ext2fs/initialize.c @@ -308,13 +308,6 @@ retry: set_field(s_inodes_count, ext2fs_blocks_count(super) / i); /* - * Make sure we have at least EXT2_FIRST_INO + 1 inodes, so - * that we have enough inodes for the filesystem(!) - */ - if (super->s_inodes_count < EXT2_FIRST_INODE(super)+1) - super->s_inodes_count = EXT2_FIRST_INODE(super)+1; - - /* * There should be at least as many inodes as the user * requested. Figure out how many inodes per group that * should be. But make sure that we don't allocate more than @@ -375,6 +368,15 @@ ipg_retry: } super->s_inodes_count = super->s_inodes_per_group * fs->group_desc_count; + /* + * Make sure we have at least EXT2_FIRST_INO + 1 inodes, so + * that we have enough inodes for the filesystem(!) + */ + if (super->s_inodes_count < EXT2_FIRST_INODE(super)+1) { + ipg += 8; + goto ipg_retry; + } + super->s_free_inodes_count = super->s_inodes_count; /* |