korg/e2fsprogs
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git synced 2024-11-24 10:33:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

e2fsck: Don't rehash directories which can fit in a single directory block

Browse Source 
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
Theodore Ts'o 2009-11-29 01:22:44 -05:00
parent 3a6be7bc18
commit f4e14505ed
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
e2fsck/rehash.c
View File

@ -736,6 +736,7 @@ errcode_t e2fsck_rehash_dir(e2fsck_t ctx, ext2_ino_t ino)
fd.compress = 1;
fd.parent = 0;
retry_nohash:
/* Read in the entire directory into memory */
retval = ext2fs_block_iterate2(fs, ino, 0, 0,
fill_dir_block, &fd);
@ -744,6 +745,17 @@ errcode_t e2fsck_rehash_dir(e2fsck_t ctx, ext2_ino_t ino)
goto errout;
}
/*
* If the entries read are less than a block, then don't index
* the directory
*/
if (!fd.compress && (fd.dir_size < (fs->blocksize - 24))) {
fd.compress = 1;
fd.dir_size = 0;
fd.num_array = 0;
goto retry_nohash;
}
#if 0
printf("%d entries (%d bytes) found in inode %d\n",
fd.num_array, fd.dir_size, ino);

12
tests/f_dup_de/expect.1
View File

@ -5,24 +5,24 @@ Duplicate entry 'mailcap.dpkg-old' found.
Pass 3: Checking directory connectivity
Pass 3A: Optimizing directories
Duplicate entry 'mailcap.dpkg-old' in /etc (12) found. Clear? yes
Duplicate entry 'fstab' in /etc (12) found. Clear? yes
Duplicate entry 'localtime' in /etc (12) found. Clear? yes
Duplicate entry 'resolv.conf' in /etc (12) found. Clear? yes
Duplicate entry 'usb.permissions' in /etc (12) found. Clear? yes
Duplicate entry 'mailcap.dpkg-old' in /etc (12) found. Clear? yes
Duplicate entry 'modules.conf.old' in /etc (12) found. Clear? yes
Entry 'modules.conf.old' in /etc (12) has a non-unique filename.
Rename to modules.conf.o~0? yes
Duplicate entry 'resolv.conf' in /etc (12) found. Clear? yes
Duplicate entry 'usb.permissions' in /etc (12) found. Clear? yes
Pass 4: Checking reference counts
Pass 5: Checking group summary information
test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
test_filesys: 18/2048 files (5.6% non-contiguous), 325/330 blocks
test_filesys: 18/2048 files (5.6% non-contiguous), 324/330 blocks
Exit status is 1

2
tests/f_dup_de/expect.2
View File

@ -3,5 +3,5 @@ Pass 2: Checking directory structure
Pass 3: Checking directory connectivity
Pass 4: Checking reference counts
Pass 5: Checking group summary information
test_filesys: 18/2048 files (5.6% non-contiguous), 325/330 blocks
test_filesys: 18/2048 files (5.6% non-contiguous), 324/330 blocks
Exit status is 0