e2fsck: avoid too much memory allocation for pfsck

e2fsck init memory according to filesystem inodes/dir numbers
recorded in the superblock, this should be aware of filesystem
number of threads, otherwise, oom happen.

E2fsprogs-commit: ed2cec54da604efe1af2734182985d1730674138

Change-Id: Ia66cd782a330f3f0215c7119c25ef701edc8b143
Signed-off-by: Wang Shilong <wshilong@ddn.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/lib/ext2fs/dblist.c b/lib/ext2fs/dblist.c
index 1fdd8f4..c4e712f 100644 (file)
--- a/lib/ext2fs/dblist.c
+++ b/lib/ext2fs/dblist.c
@@ -58,6 +58,8 @@ static errcode_t make_dblist(ext2_filsys fs, ext2_ino_t size,
                if (retval)
                        goto cleanup;
                dblist->size = (num_dirs * 2) + 12;
+               if (fs->fs_num_threads)
+                       dblist->size /= fs->fs_num_threads;
        }
        len = (size_t) sizeof(struct ext2_db_entry2) * dblist->size;
        dblist->count = count;

diff --git a/lib/ext2fs/icount.c b/lib/ext2fs/icount.c
index 766eccc..48665c7 100644 (file)
--- a/lib/ext2fs/icount.c
+++ b/lib/ext2fs/icount.c
@@ -237,6 +237,8 @@ errcode_t ext2fs_create_icount_tdb(ext2_filsys fs EXT2FS_NO_TDB_UNUSED,
         * value.
         */
        num_inodes = fs->super->s_inodes_count - fs->super->s_free_inodes_count;
+       if (fs->fs_num_threads)
+               num_inodes /= fs->fs_num_threads;
 
        icount->tdb = tdb_open(fn, num_inodes, TDB_NOLOCK | TDB_NOSYNC,
                               O_RDWR | O_CREAT | O_TRUNC, 0600);
@@ -288,6 +290,8 @@ errcode_t ext2fs_create_icount2(ext2_filsys fs, int flags, unsigned int size,
                if (retval)
                        goto errout;
                icount->size += fs->super->s_inodes_count / 50;
+               if (fs->fs_num_threads)
+                       icount->size /= fs->fs_num_threads;
        }
 
        bytes = (size_t) (icount->size * sizeof(struct ext2_icount_el));