e2fsck: Fix double-counting of non-contiguous extent-based inodes

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
index 094f523..2619272 100644 (file)
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -1781,13 +1781,6 @@ static void check_blocks_extents(e2fsck_t ctx, struct problem_context *pctx,
 
        scan_extent_node(ctx, pctx, pb, 0, ehandle);
 
-       if (pb->fragmented && pb->num_blocks < fs->super->s_blocks_per_group) {
-               if (LINUX_S_ISDIR(inode->i_mode))
-                       ctx->fs_fragmented_dir++;
-               else
-                       ctx->fs_fragmented++;
-       }
-
        ext2fs_extent_free(ehandle);
 }
 

diff --git a/tests/f_extents2/expect.1 b/tests/f_extents2/expect.1
index 094021d..fa7f6eb 100644 (file)
--- a/tests/f_extents2/expect.1
+++ b/tests/f_extents2/expect.1
@@ -66,5 +66,5 @@ Fix? yes
 
 
 test_filesys: ***** FILE SYSTEM WAS MODIFIED *****
-test_filesys: 18/32 files (44.4% non-contiguous), 145/200 blocks
+test_filesys: 18/32 files (22.2% non-contiguous), 145/200 blocks
 Exit status is 1

diff --git a/tests/f_extents2/expect.2 b/tests/f_extents2/expect.2
index 54f781a..0082a64 100644 (file)
--- a/tests/f_extents2/expect.2
+++ b/tests/f_extents2/expect.2
@@ -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/32 files (44.4% non-contiguous), 145/200 blocks
+test_filesys: 18/32 files (22.2% non-contiguous), 145/200 blocks
 Exit status is 0